---

yaml
---
r: 23082
b: refs/heads/master
c: 8b79bed
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: febd7ee239c1182147317a0e31057a0e69e260ff
+refs/heads/master: 8b79bed6dd9299af6caacc0c56a30ec3c2a92c92
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck/check/method.rs

@@ -366,10 +366,10 @@ class lookup {
     }
 
     fn add_candidates_from_scope(use_assignability: bool) {
+
         // If we're using coherence and this is one of the method invocation
         // forms it supports, don't use this method; it'll result in lots of
         // multiple-methods-in-scope errors.
-
         if self.fcx.ccx.trait_map.contains_key(self.expr.id) {
             return;
         }