diff options
| -rw-r--r-- | src/librustc/lint/builtin.rs | 2 | ||||
| -rw-r--r-- | src/librustc/traits/coherence.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-43355.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/issue-43355.rs | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index e31fc48b907..d352d359e20 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -206,7 +206,7 @@ declare_lint! { declare_lint! { pub INCOHERENT_FUNDAMENTAL_IMPLS, - Deny, + Warn, "potentially-conflicting impls were erroneously allowed" } diff --git a/src/librustc/traits/coherence.rs b/src/librustc/traits/coherence.rs index 2ed9ccec604..7d1f3b31bfc 100644 --- a/src/librustc/traits/coherence.rs +++ b/src/librustc/traits/coherence.rs @@ -277,7 +277,7 @@ pub fn orphan_check<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>, /// impl<T> IntoIterator for Vec<T> /// impl<T: Iterator> IntoIterator for T /// ``` -/// We need to be able to prove that `Option<$0>: !Iterator` for every type $0. +/// We need to be able to prove that `Vec<$0>: !Iterator` for every type $0. /// We can observe that this holds in the current crate, but we need to make /// sure this will also hold in all unknown crates (both "independent" crates, /// which we need for link-safety, and also child crates, because we don't want diff --git a/src/test/compile-fail/issue-43355.rs b/src/test/compile-fail/issue-43355.rs index d793a78799a..4db5c84df9a 100644 --- a/src/test/compile-fail/issue-43355.rs +++ b/src/test/compile-fail/issue-43355.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![deny(incoherent_fundamental_impls)] + pub trait Trait1<X> { type Output; } diff --git a/src/test/run-pass/issue-43355.rs b/src/test/run-pass/issue-43355.rs index 58d68bb955f..19431a6a429 100644 --- a/src/test/run-pass/issue-43355.rs +++ b/src/test/run-pass/issue-43355.rs @@ -11,8 +11,6 @@ // Check that the code for issue #43355 can run without an ICE, please remove // this test when it becomes an hard error. -#![allow(incoherent_fundamental_impls)] - pub trait Trait1<X> { type Output; } |