subtree-push nightly-2025-10-07

src/closures.rs

@@ -1,4 +1,4 @@
-use rustc_ast::{Label, ast, ptr};
+use rustc_ast::{Label, ast};
 use rustc_span::Span;
 use thin_vec::thin_vec;
 use tracing::debug;

src/modules.rs

@@ -198,7 +198,7 @@ impl<'ast, 'psess, 'c> ModResolver<'ast, 'psess> {
             }
 
             if is_cfg_match(&item) {
-                self.visit_cfg_match(Cow::Owned(item.into_inner()))?;
+                self.visit_cfg_match(Cow::Owned(*item))?;
                 continue;
             }
 

src/parse/macros/cfg_match.rs

@@ -1,7 +1,7 @@
 use std::panic::{AssertUnwindSafe, catch_unwind};
 
 use rustc_ast::ast;
-use rustc_ast::token::{Delimiter, TokenKind};
+use rustc_ast::token::TokenKind;
 use rustc_parse::exp;
 use rustc_parse::parser::ForceCollect;
 
@@ -26,7 +26,7 @@ fn parse_cfg_match_inner<'a>(
     let ts = mac.args.tokens.clone();
     let mut parser = build_stream_parser(psess.inner(), ts);
 
-    if parser.token == TokenKind::OpenDelim(Delimiter::Brace) {
+    if parser.token == TokenKind::OpenBrace {
         return Err("Expression position cfg_match! not yet supported");
     }
 
@@ -48,11 +48,9 @@ fn parse_cfg_match_inner<'a>(
             return Err("Expected an opening brace");
         }
 
-        while parser.token != TokenKind::CloseDelim(Delimiter::Brace)
-            && parser.token.kind != TokenKind::Eof
-        {
+        while parser.token != TokenKind::CloseBrace && parser.token.kind != TokenKind::Eof {
             let item = match parser.parse_item(ForceCollect::No) {
-                Ok(Some(item_ptr)) => item_ptr.into_inner(),
+                Ok(Some(item)) => *item,
                 Ok(None) => continue,
                 Err(err) => {
                     err.cancel();

tests/source/issue-6202/long_pat.rs

@@ -1,6 +1,7 @@
-// max_width = 120
-// error_on_line_overflow = true
-// style_edition = "2027"
+// rustfmt-max_width: 120
+// rustfmt-error_on_line_overflow: true
+// rustfmt-edition: 2024
+// rustfmt-style_edition: 2027
 
 impl EarlyLintPass for NeedlessContinue {
     fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {
@@ -11,4 +12,4 @@ impl EarlyLintPass for NeedlessContinue {
             check_final_block_stmt(cx, body, label, expr.span.ctxt());
         }
     }
-}
+}

tests/target/issue-6202/long_pat.rs

@@ -1,6 +1,7 @@
-// max_width = 120
-// error_on_line_overflow = true
-// style_edition = "2027"
+// rustfmt-max_width: 120
+// rustfmt-error_on_line_overflow: true
+// rustfmt-edition: 2024
+// rustfmt-style_edition: 2027
 
 impl EarlyLintPass for NeedlessContinue {
     fn check_expr(&mut self, cx: &EarlyContext<'_>, expr: &Expr) {