auto merge of #8223 : davidhalperin/rust/master, r=Aatch

Closes #7907

This is my first pull request so let me know if I've done anything wrong.  I tried to pick off a nice easy one.

2 files changed, 30 insertions, 3 deletions

diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs
index 4af54cef716..faabf9a9b40 100644
--- a/src/librustc/middle/typeck/coherence.rs
+++ b/src/librustc/middle/typeck/coherence.rs
@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -396,8 +396,11 @@ impl CoherenceChecker {
 
                     if self.polytypes_unify(polytype_a, polytype_b) {
                         let session = self.crate_context.tcx.sess;
-                        session.span_err(self.span_of_impl(implementation_b),
-                                         "conflicting implementations for a trait");
+                        session.span_err(
+                            self.span_of_impl(implementation_b),
+                            fmt!("conflicting implementations for trait `%s`",
+                                 ty::item_path_str(self.crate_context.tcx,
+                                                   trait_def_id)));
                         session.span_note(self.span_of_impl(implementation_a),
                                           "note conflicting implementation here");
                     }
diff --git a/src/test/compile-fail/conflicting-implementations.rs b/src/test/compile-fail/conflicting-implementations.rs
new file mode 100644
index 00000000000..598da145b92
--- /dev/null
+++ b/src/test/compile-fail/conflicting-implementations.rs
@@ -0,0 +1,24 @@
+// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// error-pattern: conflicting implementations for trait `Foo`
+trait Foo {
+}
+
+impl Foo for int {
+
+}
+
+impl<A> Foo for A {
+
+}
+
+fn main() {
+}