diff options
| author | bors <bors@rust-lang.org> | 2024-04-17 16:27:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-17 16:27:58 +0000 |
| commit | c45dee5efd0c042e9d1e24559ebd0d6424d8aa70 (patch) | |
| tree | 947e3082200a6e830e620f94c3506e4c641f988d /src/tools/miri/tests | |
| parent | 00ed4edb44ccc76d8cc992ef9f9f4634ea6d0e82 (diff) | |
| parent | abbe0d0e478eee3a599fe363e622d63967f4c4a0 (diff) | |
| download | rust-c45dee5efd0c042e9d1e24559ebd0d6424d8aa70.tar.gz rust-c45dee5efd0c042e9d1e24559ebd0d6424d8aa70.zip | |
Auto merge of #124084 - matthiaskrgr:rollup-h42psbx, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #116957 (meta: notify #t-rustdoc Zulip stream on backport nominations) - #122201 (Document overrides of `clone_from()` in core/std) - #122723 (Use same file permissions for ar_archive_writer as the LLVM archive writer) - #124030 (interpret: pass MemoryKind to adjust_alloc_base_pointer) - #124037 (Don't ascend into parent bodies when collecting stmts for possible return suggestion) - #124049 (Stabilize `const_io_structs`) - #124062 (Add another expression to weird-exprs.rs) - #124066 (Don't error on subtyping of equal types) - #124073 (Remove libc from rust_get_test_int uses) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/miri/tests')
| -rw-r--r-- | src/tools/miri/tests/fail/both_borrows/invalidate_against_protector3.stack.stderr | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/miri/tests/fail/both_borrows/invalidate_against_protector3.stack.stderr b/src/tools/miri/tests/fail/both_borrows/invalidate_against_protector3.stack.stderr index f6eeef33e9e..8426f56004b 100644 --- a/src/tools/miri/tests/fail/both_borrows/invalidate_against_protector3.stack.stderr +++ b/src/tools/miri/tests/fail/both_borrows/invalidate_against_protector3.stack.stderr @@ -6,7 +6,7 @@ LL | unsafe { *x = 0 }; | = help: this indicates a potential bug in the program: it performed an invalid operation, but the Stacked Borrows rules it violated are still experimental = help: see https://github.com/rust-lang/unsafe-code-guidelines/blob/master/wip/stacked-borrows.md for further information -help: <TAG> was created here, as the base tag for ALLOC +help: <TAG> was created here, as the root tag for ALLOC --> $DIR/invalidate_against_protector3.rs:LL:CC | LL | let ptr = alloc(Layout::for_value(&0i32)) as *mut i32; |
