From 67c0f741ef1176c60340d3cd1736b170264edcc7 Mon Sep 17 00:00:00 2001 From: Chayim Refael Friedman Date: Sat, 13 Dec 2025 20:12:08 +0200 Subject: [PATCH] Use a generated name in old format_args lowering, instead of `args` To prevent it from clashing with other names. --- .../hir-def/src/expr_store/lower/format_args.rs | 4 ++-- .../crates/hir-def/src/expr_store/tests/body.rs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tools/rust-analyzer/crates/hir-def/src/expr_store/lower/format_args.rs b/src/tools/rust-analyzer/crates/hir-def/src/expr_store/lower/format_args.rs index 7efc9a956c1c..4bbfc5b144f1 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/expr_store/lower/format_args.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/expr_store/lower/format_args.rs @@ -655,7 +655,7 @@ impl<'db> ExprCollector<'db> { .collect(); let args = self.alloc_expr_desugared(Expr::Array(Array::ElementList { elements: args })); - let args_name = Name::new_symbol_root(sym::args); + let args_name = self.generate_new_name(); let args_binding = self.alloc_binding( args_name.clone(), BindingAnnotation::Unannotated, @@ -674,7 +674,7 @@ impl<'db> ExprCollector<'db> { } else { // Generate: // super let args = (&arg0, &arg1, &...); - let args_name = Name::new_symbol_root(sym::args); + let args_name = self.generate_new_name(); let args_binding = self.alloc_binding( args_name.clone(), BindingAnnotation::Unannotated, diff --git a/src/tools/rust-analyzer/crates/hir-def/src/expr_store/tests/body.rs b/src/tools/rust-analyzer/crates/hir-def/src/expr_store/tests/body.rs index 7e48ca8f4558..504c310684d6 100644 --- a/src/tools/rust-analyzer/crates/hir-def/src/expr_store/tests/body.rs +++ b/src/tools/rust-analyzer/crates/hir-def/src/expr_store/tests/body.rs @@ -278,16 +278,16 @@ fn main() { let are = "are"; let count = 10; { - let args = (&"fancy", &(), &"!", &count, &are, ); - let args = [ + let 0 = (&"fancy", &(), &"!", &count, &are, ); + let 0 = [ builtin#lang(Argument::new_display)( - args.3, + 0.3, ), builtin#lang(Argument::new_display)( - args.0, + 0.0, ), builtin#lang(Argument::new_debug)( - args.4, + 0.4, ), builtin#lang(Argument::new_display)( - args.2, + 0.2, ), ]; unsafe { @@ -295,7 +295,7 @@ fn main() { &[ "\u{1b}hello ", " ", " friends, we ", " ", "", ], - &args, + &0, &[ builtin#lang(Placeholder::new)( 0usize,