Skip to content

Commit

Permalink
Unrolled build for rust-lang#129634
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#129634 - compiler-errors:tidy-2024, r=albertlarsan68

Fix tidy to allow `edition = "2024"` in `Cargo.toml`

Needed to upgrade to edition 2024 eventually.
  • Loading branch information
rust-timer authored Aug 27, 2024
2 parents ab869e0 + 56d8611 commit a9eb3af
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/tools/tidy/src/edition.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Tidy check to ensure that crate `edition` is '2018' or '2021'.
//! Tidy check to ensure that crate `edition` is '2021' or '2024'.
use std::path::Path;

Expand All @@ -12,18 +12,20 @@ pub fn check(path: &Path, bad: &mut bool) {
return;
}

let is_2021 = contents.lines().any(|line| line.trim() == "edition = \"2021\"");
let is_current_edition = contents
.lines()
.any(|line| line.trim() == "edition = \"2021\"" || line.trim() == "edition = \"2024\"");

let is_workspace = contents.lines().any(|line| line.trim() == "[workspace]");
let is_package = contents.lines().any(|line| line.trim() == "[package]");
assert!(is_workspace || is_package);

// Check that all packages use the 2021 edition. Virtual workspaces don't allow setting an
// edition, so these shouldn't be checked.
if is_package && !is_2021 {
if is_package && !is_current_edition {
tidy_error!(
bad,
"{} doesn't have `edition = \"2021\"` on a separate line",
"{} doesn't have `edition = \"2021\"` or `edition = \"2024\"` on a separate line",
file.display()
);
}
Expand Down

0 comments on commit a9eb3af

Please sign in to comment.