Skip to content

Commit 5586c2a

Browse files
committed
make the reason: field mandatory for @future_incompatible lints
1 parent e888d47 commit 5586c2a

File tree

5 files changed

+51
-19
lines changed

5 files changed

+51
-19
lines changed

compiler/rustc_lint/src/array_into_iter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ declare_lint! {
3434
Warn,
3535
"detects calling `into_iter` on arrays in Rust 2015 and 2018",
3636
@future_incompatible = FutureIncompatibleInfo {
37-
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2021/IntoIterator-for-arrays.html>",
3837
reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2021),
38+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2021/IntoIterator-for-arrays.html>",
3939
};
4040
}
4141

compiler/rustc_lint/src/builtin.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,8 @@ declare_lint! {
844844
Warn,
845845
"detects anonymous parameters",
846846
@future_incompatible = FutureIncompatibleInfo {
847-
reference: "issue #41686 <https://github.com/rust-lang/rust/issues/41686>",
848847
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2018),
848+
reference: "issue #41686 <https://github.com/rust-lang/rust/issues/41686>",
849849
};
850850
}
851851

@@ -1669,8 +1669,8 @@ declare_lint! {
16691669
Warn,
16701670
"`...` range patterns are deprecated",
16711671
@future_incompatible = FutureIncompatibleInfo {
1672-
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>",
16731672
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2021),
1673+
reference: "<https://doc.rust-lang.org/nightly/edition-guide/rust-2021/warnings-promoted-to-error.html>",
16741674
};
16751675
}
16761676

@@ -1804,8 +1804,8 @@ declare_lint! {
18041804
Allow,
18051805
"detects edition keywords being used as an identifier",
18061806
@future_incompatible = FutureIncompatibleInfo {
1807-
reference: "issue #49716 <https://github.com/rust-lang/rust/issues/49716>",
18081807
reason: FutureIncompatibilityReason::EditionError(Edition::Edition2018),
1808+
reference: "issue #49716 <https://github.com/rust-lang/rust/issues/49716>",
18091809
};
18101810
}
18111811

compiler/rustc_lint/src/deref_into_dyn_supertrait.rs

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use crate::{
55

66
use rustc_hir as hir;
77
use rustc_middle::{traits::util::supertraits, ty};
8+
use rustc_session::lint::FutureIncompatibilityReason;
89
use rustc_span::sym;
910

1011
declare_lint! {
@@ -48,6 +49,7 @@ declare_lint! {
4849
Warn,
4950
"`Deref` implementation usage with a supertrait trait object for output might be shadowed in the future",
5051
@future_incompatible = FutureIncompatibleInfo {
52+
reason: FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps,
5153
reference: "issue #89460 <https://github.com/rust-lang/rust/issues/89460>",
5254
};
5355
}

0 commit comments

Comments
 (0)