Skip to content

Commit bcae331

Browse files
committed
Auto merge of #1794 - cbeuw:83813, r=RalfJung
Sync with rustc_span changes rust-lang/rust#83813 made some changes to SourceMap and RealFileName. Now to get a string from a `rustc_span::FileName`, we need to specify if we would like the local filesystem path or remapped path via `--remap-path-prefix`. There seems to be only one place in miri that requires change.
2 parents 0bd2981 + 5b88045 commit bcae331

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
506e75cbf8cb5305e49a41326307004ca3976029
1+
e1ff91f439bc09f566da211c6449821b4e949279

src/shims/backtrace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
108108

109109
let lo = tcx.sess.source_map().lookup_char_pos(pos);
110110

111-
let filename = lo.file.name.to_string();
111+
let filename = lo.file.name.prefer_remapped().to_string();
112112
let lineno: u32 = lo.line as u32;
113113
// `lo.col` is 0-based - add 1 to make it 1-based for the caller.
114114
let colno: u32 = lo.col.0 as u32 + 1;

0 commit comments

Comments
 (0)