Merge branch 'master' into issue-6470-dont-delete-white-space-on-triple-colon

Author: FwP-IDN

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [Unreleased]
+
+
+## [1.9.0] 2025-01-03
+
+### Fixed
+- No longer strip `r#` prefix from `break` and `continue` labels [#6411](https://github.com/rust-lang/rustfmt/issues/6411)
+  ```rust
+  fn main() {
+      'r#if: {
+          break 'r#if;
+      }
+  }
+  ```
+- Fix panic when sorting imports [#6333](https://github.com/rust-lang/rustfmt/issues/6333)
+- Fix issue with `wrap_comments` invalidating code blocks [#6417](https://github.com/rust-lang/rustfmt/pull/6417)
+- No longer remove closure block label within a macro call [#6465](https://github.com/rust-lang/rustfmt/issues/6465)
+
+### Changed
+- Stabilize `style_edition=2024` and stabilize the `style_edition` command line option [#6431](https://github.com/rust-lang/rustfmt/pull/6431) [rust-lang/rust#134929](https://github.com/rust-lang/rust/pull/134929)
+- Apply version sorting to module declarations when using `style_edition=2024` [#6368](https://github.com/rust-lang/rustfmt/pull/6368)
+- When users set the deprecated `version` config, rustfmt now gives a hint about which equivalent `style_edition` they should use [#6361](https://github.com/rust-lang/rustfmt/pull/6361)
+- Correct version chunk splitting in the internal version sort algorithm [#6407](https://github.com/rust-lang/rustfmt/pull/6407)
+- Extend support for single line let-chain formatting to include cases where the left hand side operand is a literal, in alignment with finalized style rules as part of let-chain stabilization [#6492](https://github.com/rust-lang/rustfmt/pull/6492)
+- Begin initial formatting for `use closures` and `use chains` (`#![feature(ergonomic_clones)]`). Previously, the closure and chain was left as the developer wrote it [#6532](https://github.com/rust-lang/rustfmt/pull/6532)
+
+### Added
+- Add `style_edition=2027` to gate unstable formatting [#6324](https://github.com/rust-lang/rustfmt/pull/6324)
+- Support discovering and formatting files via external mods imported within `cfg_match`, similar to `cfg_if` behavior [#6522](https://github.com/rust-lang/rustfmt/pull/6522)
+- Add new nightly-only `match_arm_indent` option [#6525](https://github.com/rust-lang/rustfmt/pull/6525)
+  - more details in the [configuration section for this new option](https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#match_arm_indent)
+
+
 ## [1.8.0] 2024-09-20
 
 ### Fixed

Configurations.md

@@ -2245,7 +2245,7 @@ fn example() {
 
 Remove nested parens.
 
-- **Default value**: `true`,
+- **Default value**: `true`
 - **Possible values**: `true`, `false`
 - **Stable**: Yes
 
@@ -3046,6 +3046,7 @@ fn main() {
     let y = 2;
     let z = 3;
     let a = Foo { x, y, z };
+    let b = Foo { x, y, z };
 }
 ```
 

src/cargo-fmt/main.rs

@@ -6,7 +6,6 @@
 use std::cmp::Ordering;
 use std::collections::{BTreeMap, BTreeSet};
 use std::env;
-use std::ffi::OsStr;
 use std::fs;
 use std::hash::{Hash, Hasher};
 use std::io::{self, Write};
@@ -151,11 +150,13 @@ fn execute() -> i32 {
 }
 
 fn rustfmt_command() -> Command {
-    let rustfmt_var = env::var_os("RUSTFMT");
-    let rustfmt = match &rustfmt_var {
-        Some(rustfmt) => rustfmt,
-        None => OsStr::new("rustfmt"),
+    let rustfmt = match env::var_os("RUSTFMT") {
+        Some(rustfmt) => PathBuf::from(rustfmt),
+        None => env::current_exe()
+            .expect("current executable path invalid")
+            .with_file_name("rustfmt"),
     };
+
     Command::new(rustfmt)
 }
 

src/expr.rs

@@ -2022,7 +2022,11 @@ fn rewrite_let(
     // TODO(ytmimi) comments could appear between `let` and the `pat`
 
     // 4 = "let ".len()
-    let pat_shape = shape.offset_left(4, pat.span)?;
+    let mut pat_shape = shape.offset_left(4, pat.span)?;
+    if context.config.style_edition() >= StyleEdition::Edition2027 {
+        // 2 for the length of " ="
+        pat_shape = pat_shape.sub_width(2, pat.span)?;
+    }
     let pat_str = pat.rewrite_result(context, pat_shape)?;
     result.push_str(&pat_str);
 

src/imports.rs

@@ -566,8 +566,13 @@ impl UseTree {
 
         // Normalise foo::self -> foo.
         if let UseSegmentKind::Slf(None) = last.kind {
-            if !self.path.is_empty() {
-                return self;
+            if let Some(second_last) = self.path.pop() {
+                if matches!(second_last.kind, UseSegmentKind::Slf(_)) {
+                    self.path.push(second_last);
+                } else {
+                    self.path.push(second_last);
+                    return self;
+                }
             }
         }
 

tests/source/issue-6202/long_pat.rs

@@ -0,0 +1,14 @@
+// max_width = 120
+// error_on_line_overflow = true
+// style_edition = "2027"
+
+impl EarlyLintPass for NeedlessContinue {
+    fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
+        if let ExprKind::Loop(body, label, ..) | ExprKind::While(_, body, label) | ExprKind::ForLoop { body, label, .. } =
+            &expr.kind
+            && !in_external_macro(cx.sess, expr.span)
+        {
+            check_final_block_stmt(cx, body, label, expr.span.ctxt());
+        }
+    }
+}

tests/source/issue_6558.rs

@@ -0,0 +1,5 @@
+// Removing `self::self` breaks idempotence, leaving it causes a compilation error
+// which the user should be made aware of #6558
+use self;
+use self::self;
+use self::self::self;

tests/target/issue-6202/long_pat.rs

@@ -0,0 +1,15 @@
+// max_width = 120
+// error_on_line_overflow = true
+// style_edition = "2027"
+
+impl EarlyLintPass for NeedlessContinue {
+    fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
+        if let ExprKind::Loop(body, label, ..)
+        | ExprKind::While(_, body, label)
+        | ExprKind::ForLoop { body, label, .. } = &expr.kind
+            && !in_external_macro(cx.sess, expr.span)
+        {
+            check_final_block_stmt(cx, body, label, expr.span.ctxt());
+        }
+    }
+}

tests/target/issue_6558.rs

@@ -0,0 +1,4 @@
+// Removing `self::self` breaks idempotence, leaving it causes a compilation error
+// which the user should be made aware of #6558
+use self::self;
+use self::self::self;