---

yaml
---
r: 27883
b: refs/heads/try
c: 2b3c86c
h: refs/heads/master
i:
  27881: 3d922f9
  27879: b57b80a
v: v3

Author: lkuper

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 6f441e8fde85aac3321b1aad42eaa25d88d0a716
+refs/heads/try: 2b3c86cb02803e569d4f5b6891d439c9daa0b90a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/src/rustc/middle/typeck/check/method.rs

@@ -174,7 +174,11 @@ struct lookup {
                 (optional_inherent_methods, subtyping_mode);
 
             // if we found anything, stop before trying borrows
-            if self.candidates.len() > 0u { break; }
+            if self.candidates.len() > 0u {
+                debug!{"(checking method) found at least one inherent \
+                        method; giving up looking now"};
+                break;
+            }
 
             // Again, look for inherent and extension methods, this time using
             // assignability.
@@ -198,7 +202,11 @@ struct lookup {
                 (optional_inherent_methods, mutable_reference_mode);
 
             // if we found anything, stop before attempting auto-deref.
-            if self.candidates.len() > 0u { break; }
+            if self.candidates.len() > 0u {
+                debug!{"(checking method) found at least one inherent \
+                        method; giving up looking now"};
+                break;
+            }
 
             // check whether we can autoderef and if so loop around again.
             match ty::deref(self.tcx(), self.self_ty, false) {
@@ -210,7 +218,11 @@ struct lookup {
             }
         }
 
-        if self.candidates.len() == 0u { return none; }
+        if self.candidates.len() == 0u {
+            debug!{"(checking method) couldn't find any candidate methods; \
+                    returning none"};
+            return none;
+        }
 
         if self.candidates.len() > 1u {
             self.tcx().sess.span_err(
@@ -270,7 +282,7 @@ struct lookup {
     }
 
     fn add_candidates_from_param(n: uint, did: ast::def_id) {
-        debug!{"candidates_from_param"};
+        debug!{"add_candidates_from_param"};
 
         let tcx = self.tcx();
         let mut trait_bnd_idx = 0u; // count only trait bounds
@@ -320,7 +332,7 @@ struct lookup {
 
     fn add_candidates_from_trait(did: ast::def_id, trait_substs: ty::substs) {
 
-        debug!{"method_from_trait"};
+        debug!{"add_candidates_from_trait"};
 
         let ms = *ty::trait_methods(self.tcx(), did);
         for ms.eachi |i, m| {
@@ -355,7 +367,7 @@ struct lookup {
 
     fn add_candidates_from_class(did: ast::def_id, class_substs: ty::substs) {
 
-        debug!{"method_from_class"};
+        debug!{"add_candidates_from_class"};
 
         let ms = *ty::trait_methods(self.tcx(), did);