mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #129634 - compiler-errors:tidy-2024, r=albertlarsan68

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

Needed to upgrade to edition 2024 eventually.
This commit is contained in:
Matthias Krüger 2024-08-27 18:59:28 +02:00 committed by GitHub
commit df9c87cc2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/tidy/src/edition.rs
View File

@ -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; use std::path::Path;
@ -12,7 +12,9 @@ pub fn check(path: &Path, bad: &mut bool) {
return; 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_workspace = contents.lines().any(|line| line.trim() == "[workspace]");
let is_package = contents.lines().any(|line| line.trim() == "[package]"); let is_package = contents.lines().any(|line| line.trim() == "[package]");
@ -20,10 +22,10 @@ pub fn check(path: &Path, bad: &mut bool) {
// Check that all packages use the 2021 edition. Virtual workspaces don't allow setting an // Check that all packages use the 2021 edition. Virtual workspaces don't allow setting an
// edition, so these shouldn't be checked. // edition, so these shouldn't be checked.
if is_package && !is_2021 { if is_package && !is_current_edition {
tidy_error!( tidy_error!(
bad, bad,
"{} doesn't have `edition = \"2021\"` on a separate line", "{} doesn't have `edition = \"2021\"` or `edition = \"2024\"` on a separate line",
file.display() file.display()
); );
} }