nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-04 22:17:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

update error E0451 to new format

Browse Source
This commit is contained in:
Mikhail Modin 2016-08-27 23:28:38 +03:00
parent 099b9fdb1a
commit 46fc80c44e
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/librustc_privacy/lib.rs
View File

@ -384,8 +384,10 @@ impl<'a, 'tcx> PrivacyVisitor<'a, 'tcx> {
fn check_field(&mut self, span: Span, def: ty::AdtDef<'tcx>, field: ty::FieldDef<'tcx>) { fn check_field(&mut self, span: Span, def: ty::AdtDef<'tcx>, field: ty::FieldDef<'tcx>) {
if def.adt_kind() == ty::AdtKind::Struct && if def.adt_kind() == ty::AdtKind::Struct &&
!field.vis.is_accessible_from(self.curitem, &self.tcx.map) { !field.vis.is_accessible_from(self.curitem, &self.tcx.map) {
span_err!(self.tcx.sess, span, E0451, "field `{}` of struct `{}` is private", struct_span_err!(self.tcx.sess, span, E0451, "field `{}` of struct `{}` is private",
field.name, self.tcx.item_path_str(def.did)); field.name, self.tcx.item_path_str(def.did))
.span_label(span, &format!("field `{}` is private", field.name))
.emit();
} }
} }
@ -425,14 +427,19 @@ impl<'a, 'tcx, 'v> Visitor<'v> for PrivacyVisitor<'a, 'tcx> {
let method = self.tcx.tables.borrow().method_map[&method_call]; let method = self.tcx.tables.borrow().method_map[&method_call];
self.check_method(expr.span, method.def_id); self.check_method(expr.span, method.def_id);
} }
hir::ExprStruct(..) => { hir::ExprStruct(_, ref fields, _) => {
let adt = self.tcx.expr_ty(expr).ty_adt_def().unwrap(); let adt = self.tcx.expr_ty(expr).ty_adt_def().unwrap();
let variant = adt.variant_of_def(self.tcx.expect_def(expr.id)); let variant = adt.variant_of_def(self.tcx.expect_def(expr.id));
// RFC 736: ensure all unmentioned fields are visible. // RFC 736: ensure all unmentioned fields are visible.
// Rather than computing the set of unmentioned fields // Rather than computing the set of unmentioned fields
// (i.e. `all_fields - fields`), just check them all. // (i.e. `all_fields - fields`), just check them all.
for field in &variant.fields { for field in variant.fields.iter() {
self.check_field(expr.span, adt, field); let span = if let Some(f) = fields.iter().find(|f| f.name.node == field.name) {
f.span
} else {
expr.span
};
self.check_field(span, adt, field);
} }
} }
hir::ExprPath(..) => { hir::ExprPath(..) => {
@ -472,7 +479,7 @@ impl<'a, 'tcx, 'v> Visitor<'v> for PrivacyVisitor<'a, 'tcx> {
let adt = self.tcx.pat_ty(pattern).ty_adt_def().unwrap(); let adt = self.tcx.pat_ty(pattern).ty_adt_def().unwrap();
let variant = adt.variant_of_def(self.tcx.expect_def(pattern.id)); let variant = adt.variant_of_def(self.tcx.expect_def(pattern.id));
for field in fields { for field in fields {
self.check_field(pattern.span, adt, variant.field_named(field.node.name)); self.check_field(field.span, adt, variant.field_named(field.node.name));
} }
} }
PatKind::TupleStruct(_, ref fields, ddpos) => { PatKind::TupleStruct(_, ref fields, ddpos) => {

16
src/test/compile-fail/E0451.rs
View File

@ -13,8 +13,24 @@ mod Bar {
pub a: isize, pub a: isize,
b: isize, b: isize,
} }
pub struct FooTuple (
pub isize,
isize,
);
}
fn pat_match(foo: Bar::Foo) {
let Bar::Foo{a:a, b:b} = foo; //~ ERROR E0451
//~^ NOTE field `b` is private
}
fn pat_match_tuple(foo: Bar::FooTuple) {
let Bar::FooTuple(a,b) = foo; //~ ERROR E0451
//~^ NOTE field `1` is private
} }
fn main() { fn main() {
let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451 let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
//~^ NOTE field `b` is private
} }