remove an unused codepath

jdonszelmann · jdonszelmann · commit 97320ddad206 · 2025-05-02T16:39:49.000+02:00
diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
@@ -2954,12 +2954,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
             }
         }
 
-        let name = if borrow_span.in_external_macro(self.infcx.tcx.sess.source_map()) {
-            // Don't name local variables in external macros.
-            "value".to_string()
-        } else {
-            format!("`{name}`")
-        };
+        let name = format!("`{name}`");
 
         let mut err = self.path_does_not_live_long_enough(borrow_span, &name);
 

Original file line number	Diff line number	Diff line change
`@@ -2954,12 +2954,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {`
`2954`	`2954`	`}`
`2955`	`2955`	`}`
`2956`	`2956`
`2957`		`- let name = if borrow_span.in_external_macro(self.infcx.tcx.sess.source_map()) {`
`2958`		`- // Don't name local variables in external macros.`
`2959`		`- "value".to_string()`
`2960`		`- } else {`
`2961`		- format!("`{name}`")
`2962`		`- };`
	`2957`	+ let name = format!("`{name}`");
`2963`	`2958`
`2964`	`2959`	`let mut err = self.path_does_not_live_long_enough(borrow_span, &name);`
`2965`	`2960`