From 8ccacd9546a1f21ecbc33a6cd218c35fe6b0e9b4 Mon Sep 17 00:00:00 2001 From: Urgau Date: Wed, 23 Aug 2023 17:58:21 +0200 Subject: [PATCH 1/3] [RFC 3127 - Trim Paths]: Fix building tools (rustdoc, clippy, ...) --- src/shims/backtrace.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) } From c5d7d49caf6371074ecd7438101f47448ef2ec34 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 20 Oct 2023 08:03:31 +0200 Subject: [PATCH 2/3] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index 4664cc3982..5d972fdd27 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c104861b7b51d2c28e7023e7e53db16cc6677e29 +029d00c4a3176a705e0092de3e1739f8b7c32010 From d36c3e7cac5d97aefd86f0a2ecb93e9b29f70324 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 20 Oct 2023 08:04:49 +0200 Subject: [PATCH 3/3] ignore deny lints in josh --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'