diff options
| author | bors <bors@rust-lang.org> | 2023-04-29 21:46:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-29 21:46:40 +0000 |
| commit | e52cc12df16eab3637d256987d7e6d0b81836b5d (patch) | |
| tree | 5a9c43f9effeb7b82b9a2741a2e3fcc169ba5774 | |
| parent | 6aecaddcc78ce9e37359cb2f0e44e77e00914463 (diff) | |
| parent | 0b4d787b1d75e099c6cbc87d1de35293df9cb2f8 (diff) | |
| download | rust-e52cc12df16eab3637d256987d7e6d0b81836b5d.tar.gz rust-e52cc12df16eab3637d256987d7e6d0b81836b5d.zip | |
Auto merge of #2862 - RalfJung:rustup, r=RalfJung
Rustup
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/tests/fail/tree-borrows/fragile-data-race.stderr | 4 |
2 files changed, 3 insertions, 3 deletions
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 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<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> { help: the conflicting tag <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 |