---

yaml
---
r: 63249
b: refs/heads/snap-stage3
c: 5835158
h: refs/heads/master
i:
  63247: e9e9027
v: v3

Author: msullivan

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: a159f856d54c507052d24a026ccc8a568aa454f3
+refs/heads/snap-stage3: 5835158170cd4cb0abc0518de37d67b3f887ad2e
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/typeck/check/method.rs

@@ -192,7 +192,7 @@ impl<'self> LookupContext<'self> {
 
         // Prepare the list of candidates
         self.push_inherent_candidates(self_ty);
-        self.push_extension_candidates(self_ty);
+        self.push_extension_candidates();
 
         let mut enum_dids = ~[];
         let mut self_ty = self_ty;
@@ -326,7 +326,7 @@ impl<'self> LookupContext<'self> {
         }
     }
 
-    pub fn push_extension_candidates(&self, self_ty: ty::t) {
+    pub fn push_extension_candidates(&self) {
         // If the method being called is associated with a trait, then
         // find all the impls of that trait.  Each of those are
         // candidates.
@@ -343,17 +343,8 @@ impl<'self> LookupContext<'self> {
                     for impl_infos.each |impl_info| {
                         self.push_candidates_from_impl(
                             self.extension_candidates, *impl_info);
-                    }
-                }
 
-                // Look for default methods.
-                match self.tcx().provided_methods.find(trait_did) {
-                    Some(&methods) => {
-                        self.push_candidates_from_provided_methods(
-                            self.extension_candidates, self_ty, *trait_did,
-                            methods);
                     }
-                    None => {}
                 }
             }
         }
@@ -580,44 +571,6 @@ impl<'self> LookupContext<'self> {
         });
     }
 
-    pub fn push_candidates_from_provided_methods(&self,
-                                                 candidates:
-                                                 &mut ~[Candidate],
-                                                 self_ty: ty::t,
-                                                 trait_def_id: def_id,
-                                                 methods:
-                                                 &mut ~[@ProvidedMethodInfo])
-                                                 {
-        debug!("(pushing candidates from provided methods) considering trait \
-                id %d:%d",
-               trait_def_id.crate,
-               trait_def_id.node);
-
-        for methods.each |provided_method_info| {
-            if provided_method_info.method_info.ident != self.m_name { loop; }
-
-            debug!("(pushing candidates from provided methods) adding \
-                    candidate");
-
-            let method = ty::method(self.tcx(),
-                                    provided_method_info.method_info.did);
-
-            // FIXME #4099 (?) Needs to support generics.
-            let dummy_substs = substs {
-                self_r: None,
-                self_ty: None,
-                tps: ~[]
-            };
-
-            candidates.push(Candidate {
-                rcvr_ty: self_ty,
-                rcvr_substs: dummy_substs,
-                method_ty: method,
-                origin: method_static(provided_method_info.method_info.did)
-            });
-        }
-    }
-
     // ______________________________________________________________________
     // Candidate selection (see comment at start of file)