Fix fallout from rebasing.

diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
index a01b17ac194de0d4e90bd43f70246d7d00bbdfa6..ee2745ca66bc59980a675bd7dd7da2f24129d447 100644 (file)
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -1193,7 +1193,7 @@ fn add_to_index(item: &ast::Item, rbml_w: &Encoder,
             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 add_to_index(item: &ast::Item, rbml_w: &Encoder,
           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 7b05e510852791377c7fb4530fc4aa5708417b86..9131363339710f35bf22e44868e8af02db23497b 100644 (file)
--- 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 e4612d6c8b9b396c14d8aeec885b401bdf484b95..67e2b409c8e2213d8dfd8613d68d803972992dd5 100644 (file)
--- a/src/librustc_resolve/build_reduced_graph.rs
+++ b/src/librustc_resolve/build_reduced_graph.rs
@@ -504,8 +504,8 @@ fn build_reduced_graph_for_item(&mut self, item: &Item, parent: &Rc<Module>) ->
                 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 cb7224f7cbfe82856e7f846edbd9a71bf6ab9890..95523be68c3bf9ffa3ec594ca0c3202db98e267f 100644 (file)
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -2772,7 +2772,7 @@ fn resolve_item(&mut self, item: &Item) {
             }
 
             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 @@ fn with_current_self_type<T, F>(&mut self, self_type: &Ty, f: F) -> T where
     }
 
     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 @@ fn resolve_implementation(&mut self,
             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 ab7f3916728c5d8fb9616017703d901056f8ed6a..371b9268fba0de800de32544ce97f95de7f9b707 100644 (file)
--- a/src/librustc_trans/save/mod.rs
+++ b/src/librustc_trans/save/mod.rs
@@ -1004,7 +1004,7 @@ fn process_pat(&mut self, p:&ast::Pat) {
                 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 465b3c8e3ac1eb888ac8abd19886c1677b14453a..95dafccd866bf3369136c8f936b31edf362e7397 100644 (file)
--- a/src/librustc_typeck/coherence/orphan.rs
+++ b/src/librustc_typeck/coherence/orphan.rs
@@ -93,10 +93,10 @@ fn visit_item(&mut self, item: &ast::Item) {
                     }
                 }
             }
-            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 7ed372d1b4b03e8aa01763d98e8c9098533c9a3f..bc0c61ad7ad52aed65855a181b271f76097445fe 100644 (file)
--- 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))
         }