diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5c5cb0d6c..67b48a3742 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -188,7 +188,7 @@ jobs: with: fetch-depth: 256 # get a bit more of the history - name: install josh-proxy - run: cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r22.12.06 + run: RUSTFLAGS="--cap-lints warn" cargo +stable install josh-proxy --git https://github.com/josh-project/josh --tag r22.12.06 - name: setup bot git name and email run: | git config --global user.name 'The Miri Conjob Bot' diff --git a/rust-version b/rust-version index 4664cc3982..5d972fdd27 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c104861b7b51d2c28e7023e7e53db16cc6677e29 +029d00c4a3176a705e0092de3e1739f8b7c32010 diff --git a/src/shims/backtrace.rs b/src/shims/backtrace.rs index ee2edd462d..08b26f5fe8 100644 --- a/src/shims/backtrace.rs +++ b/src/shims/backtrace.rs @@ -135,7 +135,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, '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().to_string(); + let filename = lo.file.name.prefer_remapped_unconditionaly().to_string(); Ok((fn_instance, lo, name, filename)) }