From fe8ad14c87c9cad4490af6b5d9b87d20b7a98bb3 Mon Sep 17 00:00:00 2001 From: David Halperin Date: Fri, 2 Aug 2013 17:53:59 -0400 Subject: [PATCH] Add backticks around trait name in conflicting implementations error message --- src/librustc/middle/typeck/coherence.rs | 2 +- src/test/compile-fail/conflicting-implementations.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs index dc74d61f244d2..92306f73a4e7b 100644 --- a/src/librustc/middle/typeck/coherence.rs +++ b/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), diff --git a/src/test/compile-fail/conflicting-implementations.rs b/src/test/compile-fail/conflicting-implementations.rs index a56b69c07de08..598da145b9283 100644 --- 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 { }