diff options
| author | bors <bors@rust-lang.org> | 2019-05-17 23:06:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-17 23:06:51 +0000 |
| commit | a614cee22e8d79766c6a6d0f63c28f12eaec63f4 (patch) | |
| tree | bf01bbfb8d473ee17d8676dfd85efc167e868a05 /src/test | |
| parent | 73a3a90d25ddb3be3d0ad2238dbb55ae79e459dc (diff) | |
| parent | 9982e7d4071c3964e8212e3c547a7aaa4e12f01e (diff) | |
| download | rust-a614cee22e8d79766c6a6d0f63c28f12eaec63f4.tar.gz rust-a614cee22e8d79766c6a6d0f63c28f12eaec63f4.zip | |
Auto merge of #49799 - hdhoang:46205_deny_incoherent_fundamental_impls, r=nikomatsakis
lint: convert incoherent_fundamental_impls into hard error *Summary for affected authors:* If your crate depends on one of the following crates, please upgrade to a newer version: - gtk-rs: upgrade to at least 0.4 - rusqlite: upgrade to at least 0.14 - nalgebra: upgrade to at least 0.15, or the last patch version of 0.14 - spade: upgrade or refresh the Cargo.lock file to use version 1.7 - imageproc: upgrade to at least 0.16 (newer versions no longer use nalgebra) implement #46205 r? @nikomatsakis
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/issues/issue-43355.rs | 1 | ||||
| -rw-r--r-- | src/test/ui/issues/issue-43355.stderr | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/test/ui/issues/issue-43355.rs b/src/test/ui/issues/issue-43355.rs index 809300d6d19..bf819af7962 100644 --- a/src/test/ui/issues/issue-43355.rs +++ b/src/test/ui/issues/issue-43355.rs @@ -12,7 +12,6 @@ impl<X, T> Trait1<X> for T where T: Trait2<X> { impl<X> Trait1<Box<X>> for A { //~^ ERROR conflicting implementations of trait -//~| hard error //~| downstream crates may implement trait `Trait2<std::boxed::Box<_>>` for type `A` type Output = i32; } diff --git a/src/test/ui/issues/issue-43355.stderr b/src/test/ui/issues/issue-43355.stderr index 039f10447c0..75c69e5b3e3 100644 --- a/src/test/ui/issues/issue-43355.stderr +++ b/src/test/ui/issues/issue-43355.stderr @@ -1,4 +1,4 @@ -error: conflicting implementations of trait `Trait1<std::boxed::Box<_>>` for type `A`: (E0119) +error[E0119]: conflicting implementations of trait `Trait1<std::boxed::Box<_>>` for type `A`: --> $DIR/issue-43355.rs:13:1 | LL | impl<X, T> Trait1<X> for T where T: Trait2<X> { @@ -7,10 +7,8 @@ LL | impl<X, T> Trait1<X> for T where T: Trait2<X> { LL | impl<X> Trait1<Box<X>> for A { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `A` | - = note: #[deny(incoherent_fundamental_impls)] on by default - = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! - = note: for more information, see issue #46205 <https://github.com/rust-lang/rust/issues/46205> = note: downstream crates may implement trait `Trait2<std::boxed::Box<_>>` for type `A` error: aborting due to previous error +For more information about this error, try `rustc --explain E0119`. |