Skip to content

Commit 425c2c3

Browse files
committed
convert errors to warnings
1 parent 1769c63 commit 425c2c3

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Diff for: src/librustc/lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ declare_lint! {
206206

207207
declare_lint! {
208208
pub INCOHERENT_FUNDAMENTAL_IMPLS,
209-
Deny,
209+
Warn,
210210
"potentially-conflicting impls were erroneously allowed"
211211
}
212212

Diff for: src/librustc/traits/coherence.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ pub fn orphan_check<'a, 'gcx, 'tcx>(tcx: TyCtxt<'a, 'gcx, 'tcx>,
277277
/// impl<T> IntoIterator for Vec<T>
278278
/// impl<T: Iterator> IntoIterator for T
279279
/// ```
280-
/// We need to be able to prove that `Option<$0>: !Iterator` for every type $0.
280+
/// We need to be able to prove that `Vec<$0>: !Iterator` for every type $0.
281281
/// We can observe that this holds in the current crate, but we need to make
282282
/// sure this will also hold in all unknown crates (both "independent" crates,
283283
/// which we need for link-safety, and also child crates, because we don't want

Diff for: src/test/compile-fail/issue-43355.rs

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
#![deny(incoherent_fundamental_impls)]
12+
1113
pub trait Trait1<X> {
1214
type Output;
1315
}

Diff for: src/test/run-pass/issue-43355.rs

-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
// Check that the code for issue #43355 can run without an ICE, please remove
1212
// this test when it becomes an hard error.
1313

14-
#![allow(incoherent_fundamental_impls)]
15-
1614
pub trait Trait1<X> {
1715
type Output;
1816
}

0 commit comments

Comments
 (0)