Skip to content

Commit d467208

Browse files
committed
Auto merge of #13740 - Muscraft:remove-rust-2024-compat, r=epage
refactor: Remove `rust_2024_compatibility` lint group The `rust_2024_compatibility` lint group was added as a way to be compatible with `Rust`. This group is meant to be used when switching to the 2024 edition (usually enabled by `cargo fix --edition`). Since we are not going to be interacting with `cargo fix` in the standard way to fix edition lints, this group is not needed at this time. Removing this will (slightly) reduce the complexity of working on things for the 2024 edition.
2 parents 74fd5bc + d77faa6 commit d467208

File tree

10 files changed

+1
-270
lines changed

10 files changed

+1
-270
lines changed

src/cargo/util/lints.rs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,6 @@ pub struct LintGroup {
6666
pub edition_lint_opts: Option<(Edition, LintLevel)>,
6767
}
6868

69-
const RUST_2024_COMPATIBILITY: LintGroup = LintGroup {
70-
name: "rust_2024_compatibility",
71-
default_level: LintLevel::Allow,
72-
desc: "warn about compatibility with Rust 2024",
73-
edition_lint_opts: Some((Edition::Edition2024, LintLevel::Deny)),
74-
};
75-
7669
#[derive(Copy, Clone, Debug)]
7770
pub struct Lint {
7871
pub name: &'static str,
@@ -152,7 +145,7 @@ impl From<TomlLintLevel> for LintLevel {
152145
const IMPLICIT_FEATURES: Lint = Lint {
153146
name: "implicit_features",
154147
desc: "warn about the use of unstable features",
155-
groups: &[RUST_2024_COMPATIBILITY],
148+
groups: &[],
156149
default_level: LintLevel::Allow,
157150
edition_lint_opts: Some((Edition::Edition2024, LintLevel::Deny)),
158151
};

tests/testsuite/lints/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
mod implicit_features;
2-
mod rust_2024_compatibility;

tests/testsuite/lints/rust_2024_compatibility/edition_2021/mod.rs

Lines changed: 0 additions & 34 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/mod.rs

Lines changed: 0 additions & 37 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/edition_2021_warn/stderr.term.svg

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/edition_2024/mod.rs

Lines changed: 0 additions & 34 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/edition_2024/stderr.term.svg

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/mod.rs

Lines changed: 0 additions & 4 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/warn/mod.rs

Lines changed: 0 additions & 38 deletions
This file was deleted.

tests/testsuite/lints/rust_2024_compatibility/warn/stderr.term.svg

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)