From dc0e467945e7fb8eaf93f9e40e7ebcb2d5f52b0c Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Sat, 7 Nov 2015 22:40:18 +0530 Subject: Upgrade to rustc 1.6.0-nightly (d5fde83ae 2015-11-12) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … and libc 0.2 and many other dependencies --- components/plugins/lints/inheritance_integrity.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/plugins/lints/inheritance_integrity.rs') diff --git a/components/plugins/lints/inheritance_integrity.rs b/components/plugins/lints/inheritance_integrity.rs index 4f5770948aa..8ced4fb4c69 100644 --- a/components/plugins/lints/inheritance_integrity.rs +++ b/components/plugins/lints/inheritance_integrity.rs @@ -24,13 +24,13 @@ impl LintPass for InheritancePass { } impl LateLintPass for InheritancePass { - fn check_struct_def(&mut self, cx: &LateContext, def: &hir::StructDef, _n: ast::Name, + fn check_struct_def(&mut self, cx: &LateContext, def: &hir::VariantData, _n: ast::Name, _gen: &hir::Generics, id: ast::NodeId) { // Lints are run post expansion, so it's fine to use // #[_dom_struct_marker] here without also checking for #[dom_struct] if cx.tcx.has_attr(cx.tcx.map.local_def_id(id), "_dom_struct_marker") { // Find the reflector, if any - let reflector_span = def.fields.iter().enumerate() + let reflector_span = def.fields().iter().enumerate() .find(|&(ctr, f)| { if match_lang_ty(cx, &*f.node.ty, "reflector") { if ctr > 0 { @@ -44,7 +44,7 @@ impl LateLintPass for InheritancePass { }) .map(|(_, f)| f.span); // Find all #[dom_struct] fields - let dom_spans: Vec<_> = def.fields.iter().enumerate().filter_map(|(ctr, f)| { + let dom_spans: Vec<_> = def.fields().iter().enumerate().filter_map(|(ctr, f)| { if let hir::TyPath(..) = f.node.ty.node { if let Some(&def::PathResolution { base_def: def::DefTy(def_id, _), .. }) = cx.tcx.def_map.borrow().get(&f.node.ty.id) { -- cgit v1.2.3