---

yaml
---
r: 64987
b: refs/heads/snap-stage3
c: fe8ad14
h: refs/heads/master
i:
  64985: 3cb903f
  64983: 40580fe
v: v3

Author: davidhalperin

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 77adec9c9bba99ca77b360d944589b9f7b91625c
+refs/heads/snap-stage3: fe8ad14c87c9cad4490af6b5d9b87d20b7a98bb3
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/typeck/coherence.rs

@@ -397,7 +397,7 @@ impl CoherenceChecker {
                         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),

branches/snap-stage3/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 {
 }