Skip to content

Sync with rustc_span changes #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2021
Merged

Sync with rustc_span changes #1794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d2278c
Prefer remapped filename in backtrace to match rustc behaviour
cbeuw May 12, 2021
5b88045
Update rust commit sha
cbeuw May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
506e75cbf8cb5305e49a41326307004ca3976029
e1ff91f439bc09f566da211c6449821b4e949279
Copy link

@ghost ghost May 14, 2021 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file is missing the final newline, causing the ./rustup-toolchain script always changes this file to insert a newline here.

2 changes: 1 addition & 1 deletion src/shims/backtrace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx

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

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