user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
bors 2013-08-03 11:52:50 -07:00
commit b5d77d20ec
2 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc/middle/typeck/coherence.rs
View file

@ -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");
}

24
src/test/compile-fail/conflicting-implementations.rs Normal file
View file

@ -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() {
}