From 98c2d336ae3fc1bd7ef529e97289ea6f5942f0ec Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 29 Apr 2023 23:40:45 +0200 Subject: [PATCH 1/2] Preparing for merge from rustc --- src/tools/miri/rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index 1d9062874c2..d4bffe5f945 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -43a78029b4f4d92978b8fde0a677ea300b113c41 +eb62877597000ccf8bb99ab131b5977344afdfa3 From 0b4d787b1d75e099c6cbc87d1de35293df9cb2f8 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 29 Apr 2023 23:46:14 +0200 Subject: [PATCH 2/2] bless --- .../miri/tests/fail/tree-borrows/fragile-data-race.stderr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/miri/tests/fail/tree-borrows/fragile-data-race.stderr b/src/tools/miri/tests/fail/tree-borrows/fragile-data-race.stderr index 8e80bdd63c0..79744964a8b 100644 --- a/src/tools/miri/tests/fail/tree-borrows/fragile-data-race.stderr +++ b/src/tools/miri/tests/fail/tree-borrows/fragile-data-race.stderr @@ -20,8 +20,8 @@ LL | pub fn catch_unwind R + UnwindSafe, R>(f: F) -> Result { help: the conflicting tag then transitioned from Reserved to Frozen due to a foreign read access at offsets [0x0..0x1] --> RUSTLIB/core/src/ptr/mod.rs:LL:CC | -LL | crate::intrinsics::read_via_copy(src) - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +LL | crate::intrinsics::read_via_copy(src) + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ = help: this corresponds to a loss of write permissions = note: BACKTRACE (of the first span): = note: inside `main` at $DIR/fragile-data-race.rs:LL:CC