Merge pull request #4442 from rust-lang/rustup-2025-07-04

oli-obk · web-flow · commit 645b974b22d9 · 2025-07-04T06:45:10.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-6268d0aa34b46981533b09827c1454b8cf27e032
+837c5dd7de03aa97190593aef4e70d53e1bb574b
diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs
@@ -104,7 +104,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             this.tcx.sess.source_map().lookup_char_pos(BytePos(offset.bytes().try_into().unwrap()));
 
         let name = fn_instance.to_string();
-        let filename = lo.file.name.prefer_remapped_unconditionaly().to_string();
+        let filename = lo.file.name.prefer_remapped_unconditionally().to_string();
 
         interp_ok((fn_instance, lo, name, filename))
     }

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`104`	`104`	`this.tcx.sess.source_map().lookup_char_pos(BytePos(offset.bytes().try_into().unwrap()));`
`105`	`105`
`106`	`106`	`let name = fn_instance.to_string();`
`107`		`- let filename = lo.file.name.prefer_remapped_unconditionaly().to_string();`
	`107`	`+ let filename = lo.file.name.prefer_remapped_unconditionally().to_string();`
`108`	`108`
`109`	`109`	`interp_ok((fn_instance, lo, name, filename))`
`110`	`110`	`}`