diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-04-02 13:10:42 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-02 13:10:42 +1100 |
| commit | 82f04468e9016ebcaf70c2a35a7687d917becde9 (patch) | |
| tree | 8514fa5a7c24ade8e5b6f7900b1a13ea41d952b4 /src/bootstrap | |
| parent | 5f05d439223f63d7f5abb8002c6c4a183df4ac81 (diff) | |
| parent | 242558058a0aa3d5b64d911f45a07f27930016e7 (diff) | |
| download | rust-82f04468e9016ebcaf70c2a35a7687d917becde9.tar.gz rust-82f04468e9016ebcaf70c2a35a7687d917becde9.zip | |
Rollup merge of #139214 - bjorn3:edition_2024_rustfmt, r=compiler-errors
Tell rustfmt to use the 2024 edition in ./x.py fmt Most crates in this repo have been moved to the 2024 edition already. This also allows removing a rustfmt exclusion for a cg_clif test.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/src/core/build_steps/format.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/format.rs b/src/bootstrap/src/core/build_steps/format.rs index 7aa5cb2b6e5..b1a97bde97b 100644 --- a/src/bootstrap/src/core/build_steps/format.rs +++ b/src/bootstrap/src/core/build_steps/format.rs @@ -31,7 +31,7 @@ fn rustfmt( // Avoid the submodule config paths from coming into play. We only allow a single global config // for the workspace for now. cmd.arg("--config-path").arg(src.canonicalize().unwrap()); - cmd.arg("--edition").arg("2021"); + cmd.arg("--edition").arg("2024"); cmd.arg("--unstable-features"); cmd.arg("--skip-children"); if check { |