Skip to content

Commit

Permalink
Add backticks around trait name in conflicting implementations error …
Browse files Browse the repository at this point in the history
…message
  • Loading branch information
davidhalperin committed Aug 2, 2013
1 parent 77adec9 commit fe8ad14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/librustc/middle/typeck/coherence.rs
Expand Up @@ -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),
Expand Down
2 changes: 1 addition & 1 deletion src/test/compile-fail/conflicting-implementations.rs
Expand Up @@ -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 {
}

Expand Down

5 comments on commit fe8ad14

@bors
Copy link
Contributor

@bors bors commented on fe8ad14 Aug 3, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from Aatch
at davidhalperin@fe8ad14

@bors
Copy link
Contributor

@bors bors commented on fe8ad14 Aug 3, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging davidhalperin/rust/master = fe8ad14 into auto

@bors
Copy link
Contributor

@bors bors commented on fe8ad14 Aug 3, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

davidhalperin/rust/master = fe8ad14 merged ok, testing candidate = b5d77d2

@bors
Copy link
Contributor

@bors bors commented on fe8ad14 Aug 3, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = b5d77d2

Please sign in to comment.