Skip to content

Commit 90b4c8a

Browse files
committed
Auto merge of #143363 - jdonszelmann:rollup-7cv1kql, r=jdonszelmann
Rollup of 6 pull requests Successful merges: - rust-lang/rust#134006 (setup typos check in CI) - rust-lang/rust#142876 (Port `#[target_feature]` to new attribute parsing infrastructure) - rust-lang/rust#143038 (avoid suggesting traits from private dependencies) - rust-lang/rust#143083 (Fix rustdoc not correctly showing attributes on re-exports) - rust-lang/rust#143283 (document optional jobs) - rust-lang/rust#143329 (minicore: use core's `diagnostic::on_unimplemented` messages) Failed merges: - rust-lang/rust#143237 (Port `#[no_implicit_prelude]` to the new attribute parsing infrastructure) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5538601 + c54adfe commit 90b4c8a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/shims/backtrace.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
104104
this.tcx.sess.source_map().lookup_char_pos(BytePos(offset.bytes().try_into().unwrap()));
105105

106106
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();
108108

109109
interp_ok((fn_instance, lo, name, filename))
110110
}

0 commit comments

Comments
 (0)