---

lkuper · lkuper · commit e8ec99126bbb · 2012-08-08T16:07:52.000-07:00
yaml --- r: 27660 b: refs/heads/try c: 8b79bed h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: febd7ee239c1182147317a0e31057a0e69e260ff
+refs/heads/try: 8b79bed6dd9299af6caacc0c56a30ec3c2a92c92
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
diff --git a/branches/try/src/rustc/middle/typeck/check/method.rs b/branches/try/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;
         }

Original file line number	Diff line number	Diff line change
`@@ -366,10 +366,10 @@ class lookup {`
`366`	`366`	`}`
`367`	`367`
`368`	`368`	`fn add_candidates_from_scope(use_assignability: bool) {`
	`369`	`+`
`369`	`370`	`// If we're using coherence and this is one of the method invocation`
`370`	`371`	`// forms it supports, don't use this method; it'll result in lots of`
`371`	`372`	`// multiple-methods-in-scope errors.`
`372`		`-`
`373`	`373`	`if self.fcx.ccx.trait_map.contains_key(self.expr.id) {`
`374`	`374`	`return;`
`375`	`375`	`}`