Skip to content

Commit efc5714

Browse files
MarcusDunnMarcusDunn
committed
updated line #'s on ui tests and removed feature flag test
1 parent 43d8854 commit efc5714

18 files changed

+219
-234
lines changed

‎src/test/ui/borrowck/bindings-after-at-or-patterns-slice-patterns-box-patterns.stderr

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot borrow value as mutable because it is also borrowed as immutable
2-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:37:9
2+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:36:9
33
|
44
LL | ref foo @ [.., ref mut bar] => (),
55
| -------^^^^^^^^-----------^
@@ -8,7 +8,7 @@ LL | ref foo @ [.., ref mut bar] => (),
88
| immutable borrow, by `foo`, occurs here
99

1010
error: cannot borrow value as mutable because it is also borrowed as immutable
11-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:121:9
11+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:120:9
1212
|
1313
LL | ref foo @ Some(box ref mut s) => (),
1414
| -------^^^^^^^^^^^^---------^
@@ -17,7 +17,7 @@ LL | ref foo @ Some(box ref mut s) => (),
1717
| immutable borrow, by `foo`, occurs here
1818

1919
error[E0382]: borrow of moved value: `x`
20-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:19:5
20+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:18:5
2121
|
2222
LL | fn bindings_after_at_slice_patterns_move_binding(x: [String; 4]) {
2323
| - move occurs because `x` has type `[String; 4]`, which does not implement the `Copy` trait
@@ -29,7 +29,7 @@ LL | &x;
2929
| ^^ value borrowed here after move
3030

3131
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
32-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:29:5
32+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:28:5
3333
|
3434
LL | ref mut foo @ [.., _] => Some(foo),
3535
| --------------------- mutable borrow occurs here
@@ -41,7 +41,7 @@ LL | drop(r);
4141
| - mutable borrow later used here
4242

4343
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
44-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:51:5
44+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:50:5
4545
|
4646
LL | [ref foo @ .., ref bar] => Some(foo),
4747
| ------------ immutable borrow occurs here
@@ -53,7 +53,7 @@ LL | drop(r);
5353
| - immutable borrow later used here
5454

5555
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
56-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:63:5
56+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:62:5
5757
|
5858
LL | ref foo @ [.., ref bar] => Some(foo),
5959
| ----------------------- immutable borrow occurs here
@@ -65,7 +65,7 @@ LL | drop(r);
6565
| - immutable borrow later used here
6666

6767
error[E0382]: borrow of moved value: `x`
68-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:77:5
68+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:76:5
6969
|
7070
LL | fn bindings_after_at_or_patterns_move(x: Option<Test>) {
7171
| - move occurs because `x` has type `Option<Test>`, which does not implement the `Copy` trait
@@ -80,7 +80,7 @@ LL | &x;
8080
| ^^ value borrowed here after move
8181

8282
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
83-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:87:5
83+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:86:5
8484
|
8585
LL | ref foo @ Some(Test::Foo | Test::Bar) => Some(foo),
8686
| ------------------------------------- immutable borrow occurs here
@@ -92,7 +92,7 @@ LL | drop(r);
9292
| - immutable borrow later used here
9393

9494
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
95-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:99:5
95+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:98:5
9696
|
9797
LL | ref mut foo @ Some(Test::Foo | Test::Bar) => Some(foo),
9898
| ----------------------------------------- mutable borrow occurs here
@@ -104,7 +104,7 @@ LL | drop(r);
104104
| - mutable borrow later used here
105105

106106
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
107-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:113:5
107+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:112:5
108108
|
109109
LL | ref foo @ Some(box ref s) => Some(foo),
110110
| ------------------------- immutable borrow occurs here
@@ -116,7 +116,7 @@ LL | drop(r);
116116
| - immutable borrow later used here
117117

118118
error[E0382]: borrow of moved value: `x`
119-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:135:5
119+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:134:5
120120
|
121121
LL | fn bindings_after_at_slice_patterns_or_patterns_moves(x: [Option<Test>; 4]) {
122122
| - move occurs because `x` has type `[Option<Test>; 4]`, which does not implement the `Copy` trait
@@ -131,7 +131,7 @@ LL | &x;
131131
| ^^ value borrowed here after move
132132

133133
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
134-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:145:5
134+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:144:5
135135
|
136136
LL | ref a @ [ref b @ .., Some(Test::Foo | Test::Bar)] => Some(a),
137137
| ------------------------------------------------- immutable borrow occurs here
@@ -143,7 +143,7 @@ LL | drop(r);
143143
| - immutable borrow later used here
144144

145145
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
146-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:157:5
146+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:156:5
147147
|
148148
LL | ref a @ [ref b @ .., Some(Test::Foo | Test::Bar)] => Some(b),
149149
| ---------- immutable borrow occurs here
@@ -155,7 +155,7 @@ LL | drop(r);
155155
| - immutable borrow later used here
156156

157157
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
158-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:171:5
158+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:170:5
159159
|
160160
LL | [_, ref a @ Some(box ref b), ..] => Some(a),
161161
| ----------------------- immutable borrow occurs here
@@ -167,7 +167,7 @@ LL | drop(r);
167167
| - immutable borrow later used here
168168

169169
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
170-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:187:5
170+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:186:5
171171
|
172172
LL | [_, ref a @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
173173
| ------------------------------------------- immutable borrow occurs here
@@ -179,7 +179,7 @@ LL | drop(r);
179179
| - immutable borrow later used here
180180

181181
error[E0502]: cannot borrow `x` as immutable because it is also borrowed as mutable
182-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:201:5
182+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:200:5
183183
|
184184
LL | [_, ref mut a @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
185185
| ----------------------------------------------- mutable borrow occurs here
@@ -191,7 +191,7 @@ LL | drop(r);
191191
| - mutable borrow later used here
192192

193193
error[E0502]: cannot borrow `x` as mutable because it is also borrowed as immutable
194-
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:215:5
194+
--> $DIR/bindings-after-at-or-patterns-slice-patterns-box-patterns.rs:214:5
195195
|
196196
LL | ref a @ [_, ref b @ Some(box Test::Foo | box Test::Bar), ..] => Some(a),
197197
| ------------------------------------------------------------ immutable borrow occurs here

‎src/test/ui/pattern/bindings-after-at/bind-by-move-neither-can-live-while-the-other-survives-1.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot move out of value because it is borrowed
2-
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:14:14
2+
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:12:14
33
|
44
LL | Some(ref _y @ _z) => {}
55
| ------^^^--
@@ -8,7 +8,7 @@ LL | Some(ref _y @ _z) => {}
88
| value borrowed, by `_y`, here
99

1010
error: borrow of moved value
11-
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:21:14
11+
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:19:14
1212
|
1313
LL | Some(_z @ ref _y) => {}
1414
| --^^^------
@@ -18,7 +18,7 @@ LL | Some(_z @ ref _y) => {}
1818
| move occurs because `_z` has type `X` which does not implement the `Copy` trait
1919

2020
error: cannot move out of value because it is borrowed
21-
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:28:14
21+
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:26:14
2222
|
2323
LL | Some(ref mut _y @ _z) => {}
2424
| ----------^^^--
@@ -27,7 +27,7 @@ LL | Some(ref mut _y @ _z) => {}
2727
| value borrowed, by `_y`, here
2828

2929
error: borrow of moved value
30-
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:35:14
30+
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:33:14
3131
|
3232
LL | Some(_z @ ref mut _y) => {}
3333
| --^^^----------
@@ -37,7 +37,7 @@ LL | Some(_z @ ref mut _y) => {}
3737
| move occurs because `_z` has type `X` which does not implement the `Copy` trait
3838

3939
error[E0382]: borrow of moved value
40-
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:14:14
40+
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:12:14
4141
|
4242
LL | Some(ref _y @ _z) => {}
4343
| ^^^^^^^^^--
@@ -52,7 +52,7 @@ LL | Some(ref _y @ ref _z) => {}
5252
| ^^^
5353

5454
error[E0382]: borrow of moved value
55-
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:28:14
55+
--> $DIR/bind-by-move-neither-can-live-while-the-other-survives-1.rs:26:14
5656
|
5757
LL | Some(ref mut _y @ _z) => {}
5858
| ^^^^^^^^^^^^^--

‎src/test/ui/pattern/bindings-after-at/bind-by-move-no-subbindings-fun-param.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0382]: use of partially moved value
2-
--> $DIR/bind-by-move-no-subbindings-fun-param.rs:9:6
2+
--> $DIR/bind-by-move-no-subbindings-fun-param.rs:7:6
33
|
44
LL | fn f(a @ A(u): A) -> Box<u8> {
55
| ^^^^^^-^

‎src/test/ui/pattern/bindings-after-at/borrowck-move-and-move.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0382]: use of moved value
2-
--> $DIR/borrowck-move-and-move.rs:13:9
2+
--> $DIR/borrowck-move-and-move.rs:11:9
33
|
44
LL | let a @ b = U;
55
| ^^^^- - move occurs because value has type `U`, which does not implement the `Copy` trait
@@ -8,7 +8,7 @@ LL | let a @ b = U;
88
| value used here after move
99

1010
error[E0382]: use of partially moved value
11-
--> $DIR/borrowck-move-and-move.rs:15:9
11+
--> $DIR/borrowck-move-and-move.rs:13:9
1212
|
1313
LL | let a @ (b, c) = (U, U);
1414
| ^^^^^^^^-^
@@ -19,7 +19,7 @@ LL | let a @ (b, c) = (U, U);
1919
= note: partial move occurs because value has type `U`, which does not implement the `Copy` trait
2020

2121
error[E0382]: use of partially moved value
22-
--> $DIR/borrowck-move-and-move.rs:17:9
22+
--> $DIR/borrowck-move-and-move.rs:15:9
2323
|
2424
LL | let a @ (b, c) = (u(), u());
2525
| ^^^^^^^^-^
@@ -30,7 +30,7 @@ LL | let a @ (b, c) = (u(), u());
3030
= note: partial move occurs because value has type `U`, which does not implement the `Copy` trait
3131

3232
error[E0382]: use of moved value
33-
--> $DIR/borrowck-move-and-move.rs:20:16
33+
--> $DIR/borrowck-move-and-move.rs:18:16
3434
|
3535
LL | match Ok(U) {
3636
| ----- move occurs because value has type `Result<U, U>`, which does not implement the `Copy` trait
@@ -41,7 +41,7 @@ LL | a @ Ok(b) | a @ Err(b) => {}
4141
| value moved here
4242

4343
error[E0382]: use of moved value
44-
--> $DIR/borrowck-move-and-move.rs:20:29
44+
--> $DIR/borrowck-move-and-move.rs:18:29
4545
|
4646
LL | match Ok(U) {
4747
| ----- move occurs because value has type `Result<U, U>`, which does not implement the `Copy` trait
@@ -52,7 +52,7 @@ LL | a @ Ok(b) | a @ Err(b) => {}
5252
| value moved here
5353

5454
error[E0382]: use of partially moved value
55-
--> $DIR/borrowck-move-and-move.rs:27:9
55+
--> $DIR/borrowck-move-and-move.rs:25:9
5656
|
5757
LL | xs @ [a, .., b] => {}
5858
| ^^^^^^^^^^^^^-^
@@ -63,7 +63,7 @@ LL | xs @ [a, .., b] => {}
6363
= note: partial move occurs because value has type `U`, which does not implement the `Copy` trait
6464

6565
error[E0382]: use of partially moved value
66-
--> $DIR/borrowck-move-and-move.rs:31:9
66+
--> $DIR/borrowck-move-and-move.rs:29:9
6767
|
6868
LL | xs @ [_, ys @ .., _] => {}
6969
| ^^^^^^^^^-------^^^^
@@ -74,7 +74,7 @@ LL | xs @ [_, ys @ .., _] => {}
7474
= note: partial move occurs because value has type `U`, which does not implement the `Copy` trait
7575

7676
error[E0382]: use of moved value
77-
--> $DIR/borrowck-move-and-move.rs:24:12
77+
--> $DIR/borrowck-move-and-move.rs:22:12
7878
|
7979
LL | fn fun(a @ b: U) {}
8080
| ^^^^-

0 commit comments

Comments
 (0)