OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rollup merge of #17613 : bkoropoff/issue-17593

Browse Source
This commit is contained in:
Alex Crichton 2014-09-29 08:14:36 -07:00
commit 29216b5e5c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustc/middle/typeck/coherence/overlap.rs
View File

@ -49,8 +49,8 @@ impl<'cx, 'tcx> OverlapChecker<'cx, 'tcx> {
// FIXME -- it seems like this method actually pushes // FIXME -- it seems like this method actually pushes
// duplicate impls onto the list // duplicate impls onto the list
ty::populate_implementations_for_type_if_necessary(self.tcx, ty::populate_implementations_for_trait_if_necessary(self.tcx,
trait_def_id); trait_def_id);
let mut impls = Vec::new(); let mut impls = Vec::new();
self.push_impls_of_trait(trait_def_id, &mut impls); self.push_impls_of_trait(trait_def_id, &mut impls);

4
src/test/compile-fail/conflicting-implementations-aux.rs
View File

@ -15,7 +15,9 @@
extern crate trait_impl_conflict; extern crate trait_impl_conflict;
use trait_impl_conflict::Foo; use trait_impl_conflict::Foo;
impl<A> Foo for A { //~ ERROR E0117 impl<A> Foo for A {
//~^ ERROR E0117
//~^^ ERROR E0119
} }
fn main() { fn main() {