Don't name variables from external macros in borrow errors.

jdonszelmann · m-ou-se · jdonszelmann · commit 6513cff86b73 · 2025-05-02T16:17:56.000+02:00
Co-authored-by: Mara Bos &lt;m-ou.se@m-ou.se&gt;
diff --git a/compiler/rustc_borrowck/src/diagnostics/mod.rs b/compiler/rustc_borrowck/src/diagnostics/mod.rs
@@ -317,7 +317,11 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
         opt: DescribePlaceOpt,
     ) -> Option<String> {
         let local = place.local;
-        if self.body.local_decls[local].source_info.span.in_external_macro(self.infcx.tcx.sess.source_map()) {
+        if self.body.local_decls[local]
+            .source_info
+            .span
+            .in_external_macro(self.infcx.tcx.sess.source_map())
+        {
             return None;
         }
 
diff --git a/library/stdarch b/library/stdarch
@@ -1 +1 @@
-Subproject commit 1245618ccf5b2df7ab1ebb0279b9f3f726670161
+Subproject commit 4666c7376f25a265c74535585d622da3da6dfeb1
diff --git a/src/doc/nomicon b/src/doc/nomicon
@@ -1 +1 @@
-Subproject commit c76a20f0d987145dcedf05c5c073ce8d91f2e82a
+Subproject commit 0c10c30cc54736c5c194ce98c50e2de84eeb6e79
diff --git a/src/doc/reference b/src/doc/reference
@@ -1 +1 @@
-Subproject commit 3bf3402aea982b876eb56c87da17b0685c6461d5
+Subproject commit 3340922df189bddcbaad17dc3927d51a76bcd5ed
diff --git a/src/gcc b/src/gcc
@@ -1 +1 @@
-Subproject commit 0ea98a1365b81f7488073512c850e8ee951a4afd
+Subproject commit 13cc8243226a9028bb08ab6c5e1c5fe6d533bcdf
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 7918c7eb59614c39f1c4e27e99d557720976bdd7
+Subproject commit d811228b14ae2707323f37346aee3f4147e247e6
diff --git a/tests/ui/macros/auxiliary/return_from_external_macro.rs b/tests/ui/macros/auxiliary/return_from_external_macro.rs
@@ -9,4 +9,3 @@ macro_rules! foo {
         }
     };
 }
-

Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,3 @@ macro_rules! foo {`
`9`	`9`	`}`
`10`	`10`	`};`
`11`	`11`	`}`
`12`		`-`