diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-09-29 08:14:36 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-09-29 08:14:36 -0700 |
| commit | 29216b5e5c77cbf6b4476bab025c53a8eb215554 (patch) | |
| tree | 44a481792a81894b8b4220d6b9c6c4179c54d73c | |
| parent | ea3a3e9a7ff08c53fed1820c988be75769afab30 (diff) | |
| parent | cab84be812be24f003c3db9b75637724798755f3 (diff) | |
| download | rust-29216b5e5c77cbf6b4476bab025c53a8eb215554.tar.gz rust-29216b5e5c77cbf6b4476bab025c53a8eb215554.zip | |
rollup merge of #17613 : bkoropoff/issue-17593
| -rw-r--r-- | src/librustc/middle/typeck/coherence/overlap.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/conflicting-implementations-aux.rs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/librustc/middle/typeck/coherence/overlap.rs b/src/librustc/middle/typeck/coherence/overlap.rs index 48f71d95c42..88e09c30600 100644 --- a/src/librustc/middle/typeck/coherence/overlap.rs +++ b/src/librustc/middle/typeck/coherence/overlap.rs @@ -49,8 +49,8 @@ impl<'cx, 'tcx> OverlapChecker<'cx, 'tcx> { // FIXME -- it seems like this method actually pushes // duplicate impls onto the list - ty::populate_implementations_for_type_if_necessary(self.tcx, - trait_def_id); + ty::populate_implementations_for_trait_if_necessary(self.tcx, + trait_def_id); let mut impls = Vec::new(); self.push_impls_of_trait(trait_def_id, &mut impls); diff --git a/src/test/compile-fail/conflicting-implementations-aux.rs b/src/test/compile-fail/conflicting-implementations-aux.rs index c1aa6ccd9bd..99446be43ac 100644 --- a/src/test/compile-fail/conflicting-implementations-aux.rs +++ b/src/test/compile-fail/conflicting-implementations-aux.rs @@ -15,7 +15,9 @@ extern crate trait_impl_conflict; use trait_impl_conflict::Foo; -impl<A> Foo for A { //~ ERROR E0117 +impl<A> Foo for A { + //~^ ERROR E0117 + //~^^ ERROR E0119 } fn main() { |