---

yaml
---
r: 15720
b: refs/heads/try
c: f112963
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: f4cc5ff226177009cbb7f9d0a9a9bf4264857500
+refs/heads/try: f1129635ee5fc595c3638626884e49e6dd9356d9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

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

@@ -2738,6 +2738,25 @@ impl methods for lookup {
                     self.tcx().sess.span_err(
                         self.expr.span,
                         "multiple applicable methods in scope");
+
+                    // I would like to print out how each impl was imported,
+                    // but I cannot for the life of me figure out how to
+                    // annotate resolve to preserve this information.
+                    for results.eachi { |i, result|
+                        let (_, _, did) = result;
+                        let span = if did.crate == ast::local_crate {
+                            alt check self.tcx().items.get(did.node) {
+                              ast_map::node_method(m, _, _) { m.span }
+                            }
+                        } else {
+                            self.expr.span
+                        };
+                        self.tcx().sess.span_note(
+                            span,
+                            #fmt["candidate #%u is %s",
+                                 (i+1u),
+                                 ty::item_path_str(self.tcx(), did)]);
+                    }
                 }
 
                 let (self_substs, n_tps, did) = results[0];

branches/try/src/test/auxiliary/ambig_impl_2_lib.rs

@@ -0,0 +1 @@
+impl methods1 for uint { fn me() -> uint { self } }

branches/try/src/test/compile-fail/ambig_impl_1.rs

@@ -0,0 +1,3 @@
+impl methods1 for uint { fn me() -> uint { self } } //! NOTE candidate #1 is methods1::me
+impl methods2 for uint { fn me() -> uint { self } } //! NOTE candidate #2 is methods2::me
+fn main() { 1u.me(); } //! ERROR multiple applicable methods in scope

branches/try/src/test/compile-fail/ambig_impl_2_exe.rs

@@ -0,0 +1,7 @@
+// xfail-fast aux-build
+// aux-build:ambig_impl_2_lib.rs
+use ambig_impl_2_lib;
+import ambig_impl_2_lib::methods1;
+impl methods2 for uint { fn me() -> uint { self } } //! NOTE candidate #2 is methods2::me
+fn main() { 1u.me(); } //! ERROR multiple applicable methods in scope
+//!^ NOTE candidate #1 is ambig_impl_2_lib::methods1::me