diff options
| -rw-r--r-- | src/librustc/metadata/encoder.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 15 | ||||
| -rw-r--r-- | src/librustc_resolve/build_reduced_graph.rs | 2 | ||||
| -rw-r--r-- | src/librustc_resolve/lib.rs | 8 | ||||
| -rw-r--r-- | src/librustc_trans/save/mod.rs | 2 | ||||
| -rw-r--r-- | src/librustc_typeck/coherence/orphan.rs | 4 | ||||
| -rw-r--r-- | src/librustc_typeck/collect.rs | 8 |
7 files changed, 22 insertions, 21 deletions
diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs index a01b17ac194..ee2745ca66b 100644 --- a/src/librustc/metadata/encoder.rs +++ b/src/librustc/metadata/encoder.rs @@ -1193,7 +1193,7 @@ fn encode_info_for_item(ecx: &EncodeContext, None => {} } } - ast::ItemDefaultImpl(unsafety, ref ast_trait_ref) => { + ast::ItemDefaultImpl(unsafety, _) => { add_to_index(item, rbml_w, index); rbml_w.start_tag(tag_items_data_item); encode_def_id(rbml_w, def_id); @@ -1201,7 +1201,7 @@ fn encode_info_for_item(ecx: &EncodeContext, encode_name(rbml_w, item.ident.name); encode_unsafety(rbml_w, unsafety); - let trait_ref = ty::node_id_to_trait_ref(tcx, ast_trait_ref.ref_id); + let trait_ref = ty::impl_id_to_trait_ref(tcx, item.id); encode_trait_ref(rbml_w, ecx, &*trait_ref, tag_item_trait_ref); rbml_w.end_tag(); } diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 7b05e510852..91313633397 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -5116,15 +5116,12 @@ pub fn impl_trait_ref<'tcx>(cx: &ctxt<'tcx>, id: ast::DefId) if id.krate == ast::LOCAL_CRATE { debug!("(impl_trait_ref) searching for trait impl {:?}", id); if let Some(ast_map::NodeItem(item)) = cx.map.find(id.node) { - if let ast::ItemImpl(_, _, _, ref opt_trait, _, _) = item.node { - opt_trait.as_ref().map(|_| { - ty::impl_id_to_trait_ref(cx, id.node) - }) - } else { - None - ast::ItemDefaultImpl(_, ref ast_trait_ref) => { - Some(ty::node_id_to_trait_ref(cx, ast_trait_ref.ref_id)) - } + match item.node { + ast::ItemImpl(_, _, _, Some(_), _, _) | + ast::ItemDefaultImpl(..) => { + Some(ty::impl_id_to_trait_ref(cx, id.node)) + } + _ => None } } else { None diff --git a/src/librustc_resolve/build_reduced_graph.rs b/src/librustc_resolve/build_reduced_graph.rs index e4612d6c8b9..67e2b409c8e 100644 --- a/src/librustc_resolve/build_reduced_graph.rs +++ b/src/librustc_resolve/build_reduced_graph.rs @@ -504,8 +504,8 @@ impl<'a, 'b:'a, 'tcx:'b> GraphBuilder<'a, 'b, 'tcx> { parent.clone() } - ItemImpl(..) => parent.clone(), ItemDefaultImpl(_, _) | + ItemImpl(..) => parent.clone(), ItemTrait(_, _, _, ref items) => { let name_bindings = diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs index cb7224f7cbf..95523be68c3 100644 --- a/src/librustc_resolve/lib.rs +++ b/src/librustc_resolve/lib.rs @@ -2772,7 +2772,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { } ItemDefaultImpl(_, ref trait_ref) => { - self.resolve_trait_reference(item.id, trait_ref, TraitImplementation); + self.with_optional_trait_ref(Some(trait_ref), |_| {}); } ItemImpl(_, _, ref generics, @@ -3022,12 +3022,12 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { } fn with_optional_trait_ref<T, F>(&mut self, - opt_trait_ref: &Option<TraitRef>, + opt_trait_ref: Option<&TraitRef>, f: F) -> T where F: FnOnce(&mut Resolver) -> T, { let mut new_val = None; - if let Some(ref trait_ref) = *opt_trait_ref { + if let Some(trait_ref) = opt_trait_ref { match self.resolve_trait_reference(trait_ref.ref_id, &trait_ref.path, 0) { Ok(path_res) => { self.record_def(trait_ref.ref_id, path_res); @@ -3057,7 +3057,7 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> { this.visit_generics(generics); // Resolve the trait reference, if necessary. - this.with_optional_trait_ref(opt_trait_reference, |this| { + this.with_optional_trait_ref(opt_trait_reference.as_ref(), |this| { // Resolve the self type. this.visit_ty(self_type); diff --git a/src/librustc_trans/save/mod.rs b/src/librustc_trans/save/mod.rs index ab7f3916728..371b9268fba 100644 --- a/src/librustc_trans/save/mod.rs +++ b/src/librustc_trans/save/mod.rs @@ -1004,7 +1004,7 @@ impl <'l, 'tcx> DxrVisitor<'l, 'tcx> { self.collected_paths.push((p.id, path.clone(), false, recorder::StructRef)); visit::walk_path(self, path); - let def = self.analysis.ty_cx.def_map.borrow()[p.id]; + let def = self.analysis.ty_cx.def_map.borrow()[p.id].full_def(); let struct_def = match def { def::DefConst(..) => None, def::DefVariant(_, variant_id, _) => Some(variant_id), diff --git a/src/librustc_typeck/coherence/orphan.rs b/src/librustc_typeck/coherence/orphan.rs index 465b3c8e3ac..95dafccd866 100644 --- a/src/librustc_typeck/coherence/orphan.rs +++ b/src/librustc_typeck/coherence/orphan.rs @@ -93,10 +93,10 @@ impl<'cx, 'tcx,'v> visit::Visitor<'v> for OrphanChecker<'cx, 'tcx> { } } } - ast::ItemDefaultImpl(_, ref ast_trait_ref) => { + ast::ItemDefaultImpl(..) => { // "Trait" impl debug!("coherence2::orphan check: default trait impl {}", item.repr(self.tcx)); - let trait_ref = ty::node_id_to_trait_ref(self.tcx, ast_trait_ref.ref_id); + let trait_ref = ty::impl_trait_ref(self.tcx, def_id).unwrap(); if trait_ref.def_id.krate != ast::LOCAL_CRATE { span_err!(self.tcx.sess, item.span, E0318, "cannot create default implementations for traits outside the \ diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs index 7ed372d1b4b..bc0c61ad7ad 100644 --- a/src/librustc_typeck/collect.rs +++ b/src/librustc_typeck/collect.rs @@ -649,8 +649,12 @@ fn convert_item(ccx: &CollectCtxt, it: &ast::Item) { &enum_definition.variants); }, ast::ItemDefaultImpl(_, ref ast_trait_ref) => { - let trait_ref = astconv::instantiate_trait_ref(ccx, &ExplicitRscope, - ast_trait_ref, None, None); + let trait_ref = astconv::instantiate_trait_ref(ccx, + &ExplicitRscope, + ast_trait_ref, + Some(it.id), + None, + None); ty::record_default_trait_implementation(tcx, trait_ref.def_id, local_def(it.id)) } |