Auto merge of rust-lang#130593 - ytmimi:sync-from-rustfmt, r=ytmimi

Sync from rustfmt

r? `@ghost`

Cargo.lock

@@ -4630,7 +4630,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.7.1"
+version = "1.8.0"
 dependencies = [
  "annotate-snippets 0.9.2",
  "anyhow",

src/tools/rustfmt/.github/workflows/check_diff.yml

@@ -21,7 +21,7 @@ jobs:
 
  steps:
  - name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: install rustup
  run: |

src/tools/rustfmt/.github/workflows/integration.yml

@@ -64,7 +64,7 @@ jobs:
 
  steps:
  - name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  # Run build
  - name: install rustup

src/tools/rustfmt/.github/workflows/linux.yml

@@ -26,7 +26,7 @@ jobs:
 
  steps:
  - name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  # Run build
  - name: install rustup

src/tools/rustfmt/.github/workflows/mac.yml

@@ -8,7 +8,6 @@ on:
 jobs:
  test:
  # https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources
- # macOS Catalina 10.15
  runs-on: macos-latest
  name: (${{ matrix.target }}, ${{ matrix.cfg_release_channel }})
  env:
@@ -23,7 +22,7 @@ jobs:
 
  steps:
  - name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  # Run build
  - name: install rustup

src/tools/rustfmt/.github/workflows/rustdoc_check.yml

@@ -11,7 +11,7 @@ jobs:
  name: rustdoc check
  steps:
  - name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: install rustup
  run: |

src/tools/rustfmt/.github/workflows/upload-assets.yml

@@ -31,7 +31,7 @@ jobs:
  target: x86_64-pc-windows-msvc
  runs-on: ${{ matrix.os }}
  steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
 
  # Run build
  - name: install rustup

src/tools/rustfmt/.github/workflows/windows.yml

@@ -33,7 +33,7 @@ jobs:
  - name: disable git eol translation
  run: git config --global core.autocrlf false
  - name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  # Run build
  - name: Install Rustup using win.rustup.rs

src/tools/rustfmt/CHANGELOG.md

@@ -1,6 +1,66 @@
 # Changelog
 
-## [Unreleased]
+## [1.8.0] 2024-09-20
+
+### Fixed
+- Fix issue where rustfmt would crash on Windows when using the `ignore` option [#6178](https://github.com/rust-lang/rustfmt/issues/6178)
+
+### Changed
+- `rustfmt --version` now prints a commit hash that is 10 characters long [#6258](https://github.com/rust-lang/rustfmt/pull/6258)
+- `rustfmt --version` will no longer print empty git information when git information isn't available at build time.
+ For example, git information is not available when building rustfmt from a source tarball [#6266](https://github.com/rust-lang/rustfmt/pull/6266)
+- `version` has been soft deprecated and replaced by `style_edition`.
+ `style_edition=2024` is equivalent to `version=Two` and `style_edition={2015|2018|2021}`
+ are equivalent to `version=One` [#6247](https://github.com/rust-lang/rustfmt/pull/6247)
+- When `style_edition=2024` is configured `overflow_delimited_expr` will default to `true` [#6260](https://github.com/rust-lang/rustfmt/pull/6260).
+ ```rust
+ // with style_edition=2015
+ do_thing(
+ x,
+ Bar {
+ x: value,
+ y: value2,
+ },
+ );
+
+ // with style_edition=2024
+ do_thing(x, Bar {
+ x: value,
+ y: value2,
+ });
+ ```
+- When `style_edition=2024` is configured rustfmt will apply the [style guide's version sorting algorithm]
+ when sorting imports [#6284](https://github.com/rust-lang/rustfmt/pull/6284)
+ ```rust
+ // with style_edition=2015
+ use std::num::{NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU8};
+
+ // with style_edition=2024
+ use std::num::{NonZeroU8, NonZeroU16, NonZeroU32, NonZeroU64};
+ ```
+ [style guide's version sorting algorithm]: https://doc.rust-lang.org/nightly/style-guide/#sorting
+- When parsing rustfmt configurations fails, rustfmt will now include the path to the toml file in the erorr message [#6302](https://github.com/rust-lang/rustfmt/issues/6302)
+
+### Added
+- rustfmt now formats trailing where clauses in type aliases [#5887](https://github.com/rust-lang/rustfmt/pull/5887)
+ ```rust
+ type Foo
+ = Bar
+ where
+ A: B,
+ C: D;
+ ```
+- Users can now configure which `style_edition` rustfmt uses when formatting their code as specified
+ in [RFC 3338](https://rust-lang.github.io/rfcs/3338-style-evolution.html). Users are encouraged to configure `style_edition`
+ in their `rustfmt.toml` files, but the value can also be specified via the cli with `--unstable-features --style-edition={style_edition}`.
+ When `style_edition` is not explicitly configured it will be inferred from the `edition` configuration.
+ When neither `style_edition` nor `edition` are configured `style_edition` defaults to `2015` [#6247](https://github.com/rust-lang/rustfmt/pull/6247)
+
+### Misc
+- Removed `tracing-attributes` dependency [#6208](https://github.com/rust-lang/rustfmt/pull/6208)
+- Reduced syn's features in the internal `config_proc_macro` crate [#6237](https://github.com/rust-lang/rustfmt/pull/6237)
+
+## [1.7.1] 2024-06-24
 
 ### Fixed
 
@@ -238,7 +298,7 @@
 
 ### Added
 
-- New configuration option (`skip_macro_invocations`)[https://rust-lang.github.io/rustfmt/?version=master&search=#skip_macro_invocations] [#5347](https://github.com/rust-lang/rustfmt/pull/5347) that can be used to globally define a single enumerated list of macro calls that rustfmt should skip formatting. rustfmt [currently also supports this via a custom tool attribute](https://github.com/rust-lang/rustfmt#tips), however, these cannot be used in all contexts because [custom inner attributes are unstable](https://github.com/rust-lang/rust/issues/54726)
+- New configuration option [`skip_macro_invocations`](https://rust-lang.github.io/rustfmt/?version=master&search=#skip_macro_invocations) [#5347](https://github.com/rust-lang/rustfmt/pull/5347) that can be used to globally define a single enumerated list of macro calls that rustfmt should skip formatting. rustfmt [currently also supports this via a custom tool attribute](https://github.com/rust-lang/rustfmt#tips), however, these cannot be used in all contexts because [custom inner attributes are unstable](https://github.com/rust-lang/rust/issues/54726)
 
 ### Misc
 

src/tools/rustfmt/Cargo.lock

@@ -499,7 +499,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.7.1"
+version = "1.8.0"
 dependencies = [
  "annotate-snippets",
  "anyhow",
@@ -710,21 +710,9 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
  "cfg-if",
  "pin-project-lite",
- "tracing-attributes",
  "tracing-core",
 ]
 
-[[package]]
-name = "tracing-attributes"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "tracing-core"
 version = "0.1.31"

src/tools/rustfmt/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "1.7.1"
+version = "1.8.0"
 description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang/rustfmt"
 readme = "README.md"
@@ -50,7 +50,7 @@ serde_json = "1.0"
 term = "0.7"
 thiserror = "1.0.40"
 toml = "0.7.4"
-tracing = "0.1.37"
+tracing = { version = "0.1.37", default-features = false, features = ["std"] }
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
 unicode-segmentation = "1.9"
 unicode-width = "0.1"

src/tools/rustfmt/Configurations.md

@@ -534,7 +534,7 @@ Note that this option may be soft-deprecated in the future once the [ignore](#ig
 Specifies which edition is used by the parser.
 
 - **Default value**: `"2015"`
-- **Possible values**: `"2015"`, `"2018"`, `"2021"`
+- **Possible values**: `"2015"`, `"2018"`, `"2021"`, `"2024"`
 - **Stable**: Yes
 
 Rustfmt is able to pick up the edition used by reading the `Cargo.toml` file if executed
@@ -2692,6 +2692,17 @@ By default this option is set as a percentage of [`max_width`](#max_width) provi
 
 See also [`max_width`](#max_width) and [`use_small_heuristics`](#use_small_heuristics)
 
+## `style_edition`
+
+Controls the edition of the [Rust Style Guide] to use for formatting ([RFC 3338])
+
+- **Default value**: `"2015"`
+- **Possible values**: `"2015"`, `"2018"`, `"2021"`, `"2024"` (unstable variant)
+- **Stable**: No
+
+[Rust Style Guide]: https://doc.rust-lang.org/nightly/style-guide/
+[RFC 3338]: https://rust-lang.github.io/rfcs/3338-style-evolution.html
+
 ## `tab_spaces`
 
 Number of spaces per tab
@@ -3051,9 +3062,7 @@ fn main() {
 
 ## `version`
 
-Which version of the formatting rules to use. `Version::One` is backwards-compatible
-with Rustfmt 1.0. Other versions are only backwards compatible within a major
-version number.
+This option is deprecated and has been replaced by [`style_edition`](#style_edition)
 
 - **Default value**: `One`
 - **Possible values**: `One`, `Two`

src/tools/rustfmt/Contributing.md

@@ -109,17 +109,17 @@ If you want to test modified `cargo-fmt`, or run `rustfmt` on the whole project
 RUSTFMT="./target/debug/rustfmt" cargo run --bin cargo-fmt -- --manifest-path path/to/project/you/want2test/Cargo.toml
 ```
 
-### Version-gate formatting changes
+### Gate formatting changes
 
-A change that introduces a different code-formatting should be gated on the
-`version` configuration. This is to ensure the formatting of the current major
-release is preserved, while allowing fixes to be implemented for the next
-release.
+A change that introduces a different code-formatting must be gated on the
+`style_edition` configuration. This is to ensure rustfmt upholds its formatting
+stability guarantees and adheres to the Style Edition process set in [RFC 3338]
 
-This is done by conditionally guarding the change like so:
+This can be done by conditionally guarding the formatting change, e.g.:
 
 ```rust
-if config.version() == Version::One { // if the current major release is 1.x
+// if the current stable Style Edition is Edition 2024
+if config.style_edition() <= StyleEdition::Edition2024 {
  // current formatting
 } else {
  // new formatting
@@ -129,13 +129,14 @@ if config.version() == Version::One { // if the current major release is 1.x
 This allows the user to apply the next formatting explicitly via the
 configuration, while being stable by default.
 
-When the next major release is done, the code block of the previous formatting
-can be deleted, e.g., the first block in the example above when going from `1.x`
-to `2.x`.
+This can then be enhanced as needed if and when there are
+new Style Editions with differing formatting prescriptions.
 
 | Note: Only formatting changes with default options need to be gated. |
 | --- |
 
+[RFC 3338]: https://rust-lang.github.io/rfcs/3338-style-evolution.html
+
 ### A quick tour of Rustfmt
 
 Rustfmt is basically a pretty printer - that is, its mode of operation is to

src/tools/rustfmt/build.rs

@@ -25,7 +25,7 @@ fn main() {
 // (git not installed or if this is not a git repository) just return an empty string.
 fn commit_info() -> String {
  match (channel(), commit_hash(), commit_date()) {
- (channel, Some(hash), Some(date)) => format!("{} ({} {})", channel, hash.trim_end(), date),
+ (channel, Some(hash), Some(date)) => format!("{} ({} {})", channel, hash, date),
  _ => String::new(),
  }
 }
@@ -39,17 +39,20 @@ fn channel() -> String {
 }
 
 fn commit_hash() -> Option<String> {
- Command::new("git")
- .args(["rev-parse", "--short", "HEAD"])
+ let output = Command::new("git")
+ .args(["rev-parse", "HEAD"])
  .output()
- .ok()
- .and_then(|r| String::from_utf8(r.stdout).ok())
+ .ok()?;
+ let mut stdout = output.status.success().then_some(output.stdout)?;
+ stdout.truncate(10);
+ String::from_utf8(stdout).ok()
 }
 
 fn commit_date() -> Option<String> {
- Command::new("git")
+ let output = Command::new("git")
  .args(["log", "-1", "--date=short", "--pretty=format:%cd"])
  .output()
- .ok()
- .and_then(|r| String::from_utf8(r.stdout).ok())
+ .ok()?;
+ let stdout = output.status.success().then_some(output.stdout)?;
+ String::from_utf8(stdout).ok()
 }