Skip to content

Commit 273bfd4

Browse files
committed
Ignore two-phase-reservation-sharing-interference-2.rs in Polonius compare mode
This is just a difference from the test construction, it's ignore-compare-mode-nll and manually checks migrate/nll over edition2015/2018. This failure is because the `migrate2015` and `migrate2018` revisions are ran with `-Zpolonius`. There is no actual difference in the errors output by NLLs and Polonius.
1 parent d4ca9a3 commit 273bfd4

5 files changed

+13
-12
lines changed

src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2015.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
2-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:18:5
2+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:19:5
33
|
44
LL | let shared = &v;
55
| -- immutable borrow occurs here
@@ -11,7 +11,7 @@ LL | v.extend(shared);
1111
| mutable borrow occurs here
1212

1313
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
14-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:28:5
14+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:29:5
1515
|
1616
LL | v.extend(&v);
1717
| ^^------^--^
@@ -21,7 +21,7 @@ LL | v.extend(&v);
2121
| mutable borrow occurs here
2222

2323
warning: cannot borrow `v` as mutable because it is also borrowed as immutable
24-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:39:5
24+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:40:5
2525
|
2626
LL | let shared = &v;
2727
| -- immutable borrow occurs here

src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.migrate2018.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
2-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:18:5
2+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:19:5
33
|
44
LL | let shared = &v;
55
| -- immutable borrow occurs here
@@ -11,7 +11,7 @@ LL | v.extend(shared);
1111
| mutable borrow occurs here
1212

1313
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
14-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:28:5
14+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:29:5
1515
|
1616
LL | v.extend(&v);
1717
| ^^------^--^
@@ -21,7 +21,7 @@ LL | v.extend(&v);
2121
| mutable borrow occurs here
2222

2323
warning: cannot borrow `v` as mutable because it is also borrowed as immutable
24-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:39:5
24+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:40:5
2525
|
2626
LL | let shared = &v;
2727
| -- immutable borrow occurs here

src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2015.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
2-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:18:5
2+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:19:5
33
|
44
LL | let shared = &v;
55
| -- immutable borrow occurs here
@@ -10,7 +10,7 @@ LL | v.extend(shared);
1010
| mutable borrow occurs here
1111

1212
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
13-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:28:5
13+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:29:5
1414
|
1515
LL | v.extend(&v);
1616
| ^^------^--^
@@ -20,7 +20,7 @@ LL | v.extend(&v);
2020
| mutable borrow occurs here
2121

2222
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
23-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:39:5
23+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:40:5
2424
|
2525
LL | let shared = &v;
2626
| -- immutable borrow occurs here

src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.nll2018.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
2-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:18:5
2+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:19:5
33
|
44
LL | let shared = &v;
55
| -- immutable borrow occurs here
@@ -10,7 +10,7 @@ LL | v.extend(shared);
1010
| mutable borrow occurs here
1111

1212
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
13-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:28:5
13+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:29:5
1414
|
1515
LL | v.extend(&v);
1616
| ^^------^--^
@@ -20,7 +20,7 @@ LL | v.extend(&v);
2020
| mutable borrow occurs here
2121

2222
error[E0502]: cannot borrow `v` as mutable because it is also borrowed as immutable
23-
--> $DIR/two-phase-reservation-sharing-interference-2.rs:39:5
23+
--> $DIR/two-phase-reservation-sharing-interference-2.rs:40:5
2424
|
2525
LL | let shared = &v;
2626
| -- immutable borrow occurs here

src/test/ui/borrowck/two-phase-reservation-sharing-interference-2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// everyone else.
44

55
//ignore-compare-mode-nll
6+
//ignore-compare-mode-polonius
67

78
//revisions: migrate2015 migrate2018 nll2015 nll2018
89

0 commit comments

Comments
 (0)