Skip to content

Commit aec861b

Browse files
committed
consistent folder naming: stacked-borrows -> stacked_borrows
1 parent 3f0d24a commit aec861b

12 files changed

+6
-6
lines changed

src/tools/miri/tests/pass/both_borrows/2phase.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
//@revisions: stack tree
22
//@[tree]compile-flags: -Zmiri-tree-borrows
33

4-
// FIXME: this miscompiles with optimizations, see <https://github.com/rust-lang/rust/issues/132898>.
5-
//@compile-flags: -Zmir-opt-level=0
6-
74
trait S: Sized {
85
fn tpb(&mut self, _s: Self) {}
96
}
@@ -34,9 +31,9 @@ fn two_phase3(b: bool) {
3431
));
3532
}
3633

37-
#[allow(unreachable_code)]
3834
fn two_phase_raw() {
3935
let x: &mut Vec<i32> = &mut vec![];
36+
#[allow(unreachable_code)] // The `push` itself never gets reached.
4037
x.push({
4138
// Unfortunately this does not trigger the problem of creating a
4239
// raw ponter from a pointer that had a two-phase borrow derived from

src/tools/miri/tests/pass/stacked-borrows/issue-miri-2389.stderr renamed to src/tools/miri/tests/pass/stacked_borrows/issue-miri-2389.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: integer-to-pointer cast
2-
--> tests/pass/stacked-borrows/issue-miri-2389.rs:LL:CC
2+
--> tests/pass/stacked_borrows/issue-miri-2389.rs:LL:CC
33
|
44
LL | let wildcard = &root0 as *const Cell<i32> as usize as *const Cell<i32>;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ integer-to-pointer cast
@@ -10,5 +10,5 @@ LL | let wildcard = &root0 as *const Cell<i32> as usize as *const Cell<i
1010
= help: you can then set `MIRIFLAGS=-Zmiri-strict-provenance` to ensure you are not relying on `with_exposed_provenance` semantics
1111
= help: alternatively, `MIRIFLAGS=-Zmiri-permissive-provenance` disables this warning
1212
= note: BACKTRACE:
13-
= note: inside `main` at tests/pass/stacked-borrows/issue-miri-2389.rs:LL:CC
13+
= note: inside `main` at tests/pass/stacked_borrows/issue-miri-2389.rs:LL:CC
1414

src/tools/miri/tests/pass/stacked-borrows/stacked-borrows.rs renamed to src/tools/miri/tests/pass/stacked_borrows/stacked-borrows.rs

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
// FIXME: this miscompiles with optimizations, see <https://github.com/rust-lang/rust/issues/132898>.
2+
//@compile-flags: -Zmir-opt-level=0
3+
14
// Test various stacked-borrows-specific things
25
// (i.e., these do not work the same under TB).
36
fn main() {

0 commit comments

Comments
 (0)