Add backticks around trait name in conflicting implementations error message

diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs
index dc74d61f244d2a097cd6244be8d37d0f344dac60..92306f73a4e7b03fa5bdec4bce0b702daaf9dba6 100644 (file)
--- a/src/librustc/middle/typeck/coherence.rs
+++ b/src/librustc/middle/typeck/coherence.rs
@@ -397,7 +397,7 @@ pub fn check_implementation_coherence_of(&self, trait_def_id: def_id) {
                         let session = self.crate_context.tcx.sess;
                         session.span_err(
                             self.span_of_impl(implementation_b),
-                            fmt!("conflicting implementations for trait %s",
+                            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),

diff --git a/src/test/compile-fail/conflicting-implementations.rs b/src/test/compile-fail/conflicting-implementations.rs
index a56b69c07de0857a5f990edd9add1de521d2d160..598da145b9283a3747ce11b59d730fb9a1bcdef0 100644 (file)
--- a/src/test/compile-fail/conflicting-implementations.rs
+++ b/src/test/compile-fail/conflicting-implementations.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: conflicting implementations for trait Foo
+// error-pattern: conflicting implementations for trait `Foo`
 trait Foo {
 }