Skip to content

Commit de05548

Browse files
clintfredclintfred
committed
re-blessing error output: ./x.py test src/test/ui --stage 1 --bless
1 parent 755b320 commit de05548

20 files changed

+37
-37
lines changed

‎src/test/ui/borrowck/borrowck-asm.mir.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | asm!("nop" : : "r"(x));
88
| - value moved here
99
LL | }
1010
LL | let z = x; //[ast]~ ERROR use of moved value: `x`
11-
| ^ value used here after partial move
11+
| ^ value used here after move
1212

1313
error[E0503]: cannot use `x` because it was mutably borrowed
1414
--> $DIR/borrowck-asm.rs:35:32
@@ -71,7 +71,7 @@ LL | let x = &mut 2;
7171
| - move occurs because `x` has type `&mut i32`, which does not implement the `Copy` trait
7272
LL | unsafe {
7373
LL | asm!("nop" : : "r"(x), "r"(x) ); //[ast]~ ERROR use of moved value
74-
| - ^ value used here after partial move
74+
| - ^ value used here after move
7575
| |
7676
| value moved here
7777

‎src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ error[E0382]: use of moved value: `x`
367367
LL | drop(x);
368368
| - value moved here
369369
LL | drop(x); //[ast]~ ERROR use of moved value: `x`
370-
| ^ value used here after partial move
370+
| ^ value used here after move
371371
|
372372
= note: move occurs because `x` has type `std::vec::Vec<i32>`, which does not implement the `Copy` trait
373373

‎src/test/ui/borrowck/borrowck-drop-from-guard.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | Some(_) if { drop(my_str); false } => {}
88
| ------ value moved here
99
LL | Some(_) => {}
1010
LL | None => { foo(my_str); } //~ ERROR [E0382]
11-
| ^^^^^^ value used here after partial move
11+
| ^^^^^^ value used here after move
1212

1313
error: aborting due to previous error
1414

‎src/test/ui/borrowck/borrowck-issue-48962.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let mut src = &mut node;
66
LL | {src};
77
| --- value moved here
88
LL | src.next = None; //~ ERROR use of moved value: `src` [E0382]
9-
| ^^^^^^^^ value used here after partial move
9+
| ^^^^^^^^ value used here after move
1010

1111
error[E0382]: use of moved value: `src`
1212
--> $DIR/borrowck-issue-48962.rs:22:5
@@ -16,7 +16,7 @@ LL | let mut src = &mut (22, 44);
1616
LL | {src};
1717
| --- value moved here
1818
LL | src.0 = 66; //~ ERROR use of moved value: `src` [E0382]
19-
| ^^^^^^^^^^ value used here after partial move
19+
| ^^^^^^^^^^ value used here after move
2020

2121
error: aborting due to 2 previous errors
2222

‎src/test/ui/borrowck/borrowck-move-moved-value-into-closure.mir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ LL | call_f(move|| { *t + 1 });
1111
LL | call_f(move|| { *t + 1 }); //[ast]~ ERROR capture of moved value
1212
| ^^^^^^ - use occurs due to use in closure
1313
| |
14-
| value used here after partial move
14+
| value used here after move
1515

1616
error: aborting due to previous error
1717

‎src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0382]: use of moved value: `a[..]`
44
LL | let [_, _x] = a;
55
| -- value moved here
66
LL | let [.., _y] = a; //[ast]~ ERROR [E0382]
7-
| ^^ value used here after partial move
7+
| ^^ value used here after move
88
|
99
= note: move occurs because `a[..]` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
1010

@@ -14,7 +14,7 @@ error[E0382]: use of moved value: `a[..]`
1414
LL | let [_x, _] = a;
1515
| -- value moved here
1616
LL | let [_y..] = a; //[ast]~ ERROR [E0382]
17-
| ^^ value used here after partial move
17+
| ^^ value used here after move
1818
|
1919
= note: move occurs because `a[..]` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
2020

‎src/test/ui/borrowck/borrowck-reinit.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ LL | let mut x = Box::new(0);
1717
LL | drop(x);
1818
| - value moved here
1919
LL | let _ = (1,x); //~ ERROR use of moved value: `x` (Ast)
20-
| ^ value used here after partial move
20+
| ^ value used here after move
2121

2222
error: aborting due to 2 previous errors
2323

‎src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out-with-mut.nll.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let mut t: Tuple = (S(0), 0);
66
LL | drop(t);
77
| - value moved here
88
LL | t.0 = S(1);
9-
| ^^^^^^^^^^ value partially assigned here after partial move
9+
| ^^^^^^^^^^ value partially assigned here after move
1010

1111
error[E0382]: assign to part of moved value: `u`
1212
--> $DIR/issue-54499-field-mutation-of-moved-out-with-mut.rs:34:9
@@ -16,7 +16,7 @@ LL | let mut u: Tpair = Tpair(S(0), 0);
1616
LL | drop(u);
1717
| - value moved here
1818
LL | u.0 = S(1);
19-
| ^^^^^^^^^^ value partially assigned here after partial move
19+
| ^^^^^^^^^^ value partially assigned here after move
2020

2121
error[E0382]: assign to part of moved value: `v`
2222
--> $DIR/issue-54499-field-mutation-of-moved-out-with-mut.rs:45:9
@@ -26,7 +26,7 @@ LL | let mut v: Spair = Spair { x: S(0), y: 0 };
2626
LL | drop(v);
2727
| - value moved here
2828
LL | v.x = S(1);
29-
| ^^^^^^^^^^ value partially assigned here after partial move
29+
| ^^^^^^^^^^ value partially assigned here after move
3030

3131
error: aborting due to 3 previous errors
3232

‎src/test/ui/borrowck/issue-54499-field-mutation-of-moved-out.nll.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LL | let t: Tuple = (S(0), 0);
1515
LL | drop(t);
1616
| - value moved here
1717
LL | t.0 = S(1);
18-
| ^^^^^^^^^^ value partially assigned here after partial move
18+
| ^^^^^^^^^^ value partially assigned here after move
1919

2020
error[E0594]: cannot assign to `t.1`, as `t` is not declared as mutable
2121
--> $DIR/issue-54499-field-mutation-of-moved-out.rs:27:9
@@ -43,7 +43,7 @@ LL | let u: Tpair = Tpair(S(0), 0);
4343
LL | drop(u);
4444
| - value moved here
4545
LL | u.0 = S(1);
46-
| ^^^^^^^^^^ value partially assigned here after partial move
46+
| ^^^^^^^^^^ value partially assigned here after move
4747

4848
error[E0594]: cannot assign to `u.1`, as `u` is not declared as mutable
4949
--> $DIR/issue-54499-field-mutation-of-moved-out.rs:42:9
@@ -71,7 +71,7 @@ LL | let v: Spair = Spair { x: S(0), y: 0 };
7171
LL | drop(v);
7272
| - value moved here
7373
LL | v.x = S(1);
74-
| ^^^^^^^^^^ value partially assigned here after partial move
74+
| ^^^^^^^^^^ value partially assigned here after move
7575

7676
error[E0594]: cannot assign to `v.y`, as `v` is not declared as mutable
7777
--> $DIR/issue-54499-field-mutation-of-moved-out.rs:57:9

‎src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ error[E0382]: use of moved value: `*f`
1313
LL | fn twice_ten_so<F: FnOnce(i32) -> i32>(f: Box<F>) {
1414
| - consider adding a `Copy` constraint to this type argument
1515
LL | f(f(10));
16-
| - ^ value used here after partial move
16+
| - ^ value used here after move
1717
| |
1818
| value moved here
1919
|
@@ -44,7 +44,7 @@ error[E0382]: use of moved value: `*f`
4444
--> $DIR/two-phase-nonrecv-autoref.rs:85:11
4545
|
4646
LL | f(f(10));
47-
| - ^ value used here after partial move
47+
| - ^ value used here after move
4848
| |
4949
| value moved here
5050
|

‎src/test/ui/issues/issue-29723.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | 0 if { drop(s); false } => String::from("oops"),
88
| - value moved here
99
...
1010
LL | s
11-
| ^ value used here after partial move
11+
| ^ value used here after move
1212

1313
error: aborting due to previous error
1414

‎src/test/ui/issues/issue-34721.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LL | x.zero()
1313
| - value moved here
1414
LL | };
1515
LL | x.zero()
16-
| ^ value used here after partial move
16+
| ^ value used here after move
1717

1818
error: aborting due to previous error
1919

‎src/test/ui/moves/moves-based-on-type-tuple.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ error[E0382]: use of moved value: `x` (Mir)
1414
LL | fn dup(x: Box<isize>) -> Box<(Box<isize>,Box<isize>)> {
1515
| - move occurs because `x` has type `std::boxed::Box<isize>`, which does not implement the `Copy` trait
1616
LL | box (x, x)
17-
| - ^ value used here after partial move
17+
| - ^ value used here after move
1818
| |
1919
| value moved here
2020

‎src/test/ui/nll/closure-access-spans.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ LL | let r = x;
6666
LL | || x.len(); //~ ERROR
6767
| ^^ - borrow occurs due to use in closure
6868
| |
69-
| value borrowed here after partial move
69+
| value borrowed here after move
7070

7171
error[E0382]: borrow of moved value: `x`
7272
--> $DIR/closure-access-spans.rs:42:5
@@ -78,7 +78,7 @@ LL | let r = x;
7878
LL | || x = String::new(); //~ ERROR
7979
| ^^ - borrow occurs due to use in closure
8080
| |
81-
| value borrowed here after partial move
81+
| value borrowed here after move
8282

8383
error[E0382]: borrow of moved value: `x`
8484
--> $DIR/closure-access-spans.rs:47:5
@@ -90,7 +90,7 @@ LL | let r = x;
9090
LL | || *x = String::new(); //~ ERROR
9191
| ^^ - borrow occurs due to use in closure
9292
| |
93-
| value borrowed here after partial move
93+
| value borrowed here after move
9494

9595
error[E0382]: use of moved value: `x`
9696
--> $DIR/closure-access-spans.rs:52:5
@@ -102,7 +102,7 @@ LL | let r = x;
102102
LL | || x; //~ ERROR
103103
| ^^ - use occurs due to use in closure
104104
| |
105-
| value used here after partial move
105+
| value used here after move
106106

107107
error: aborting due to 9 previous errors
108108

‎src/test/ui/nll/closure-move-spans.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LL | || x;
88
| |
99
| value moved into closure here
1010
LL | let y = x; //~ ERROR
11-
| ^ value used here after partial move
11+
| ^ value used here after move
1212

1313
error[E0382]: borrow of moved value: `x`
1414
--> $DIR/closure-move-spans.rs:12:13
@@ -20,7 +20,7 @@ LL | || x;
2020
| |
2121
| value moved into closure here
2222
LL | let y = &x; //~ ERROR
23-
| ^^ value borrowed here after partial move
23+
| ^^ value borrowed here after move
2424

2525
error[E0382]: borrow of moved value: `x`
2626
--> $DIR/closure-move-spans.rs:17:13
@@ -32,7 +32,7 @@ LL | || x;
3232
| |
3333
| value moved into closure here
3434
LL | let y = &mut x; //~ ERROR
35-
| ^^^^^^ value borrowed here after partial move
35+
| ^^^^^^ value borrowed here after move
3636

3737
error: aborting due to 3 previous errors
3838

‎src/test/ui/nll/decl-macro-illegal-copy.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LL | $wrapper.inner
55
| -------------- value moved here
66
...
77
LL | wrapper.inner,
8-
| ^^^^^^^^^^^^^ value used here after partial move
8+
| ^^^^^^^^^^^^^ value used here after move
99
|
1010
= note: move occurs because `wrapper.inner` has type `NonCopy`, which does not implement the `Copy` trait
1111

‎src/test/ui/nll/issue-21232-partial-init-and-erroneous-use.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | let mut d = D { x: 0, s: S{ y: 0, z: 0 } };
1818
LL | drop(d);
1919
| - value moved here
2020
LL | d.x = 10;
21-
| ^^^^^^^^ value assigned here after partial move
21+
| ^^^^^^^^ value assigned here after move
2222

2323
error[E0381]: assign to part of possibly uninitialized variable: `d`
2424
--> $DIR/issue-21232-partial-init-and-erroneous-use.rs:49:5

‎src/test/ui/nll/issue-21232-partial-init-and-use.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | let mut s: S<B> = S::new(); drop(s);
1818
| |
1919
| move occurs because `s` has type `S<std::boxed::Box<u32>>`, which does not implement the `Copy` trait
2020
LL | s.x = 10; s.y = Box::new(20);
21-
| ^^^^^^^^ value partially assigned here after partial move
21+
| ^^^^^^^^ value partially assigned here after move
2222

2323
error[E0382]: assign to part of moved value: `t`
2424
--> $DIR/issue-21232-partial-init-and-use.rs:120:5
@@ -28,7 +28,7 @@ LL | let mut t: T = (0, Box::new(0)); drop(t);
2828
| |
2929
| move occurs because `t` has type `(u32, std::boxed::Box<u32>)`, which does not implement the `Copy` trait
3030
LL | t.0 = 10; t.1 = Box::new(20);
31-
| ^^^^^^^^ value partially assigned here after partial move
31+
| ^^^^^^^^ value partially assigned here after move
3232

3333
error[E0381]: assign to part of possibly uninitialized variable: `s`
3434
--> $DIR/issue-21232-partial-init-and-use.rs:127:5
@@ -50,7 +50,7 @@ LL | let mut s: S<B> = S::new(); drop(s);
5050
| |
5151
| move occurs because `s` has type `S<std::boxed::Box<u32>>`, which does not implement the `Copy` trait
5252
LL | s.x = 10;
53-
| ^^^^^^^^ value partially assigned here after partial move
53+
| ^^^^^^^^ value partially assigned here after move
5454

5555
error[E0382]: assign to part of moved value: `t`
5656
--> $DIR/issue-21232-partial-init-and-use.rs:148:5
@@ -60,7 +60,7 @@ LL | let mut t: T = (0, Box::new(0)); drop(t);
6060
| |
6161
| move occurs because `t` has type `(u32, std::boxed::Box<u32>)`, which does not implement the `Copy` trait
6262
LL | t.0 = 10;
63-
| ^^^^^^^^ value partially assigned here after partial move
63+
| ^^^^^^^^ value partially assigned here after move
6464

6565
error[E0381]: assign to part of possibly uninitialized variable: `s`
6666
--> $DIR/issue-21232-partial-init-and-use.rs:155:5
@@ -159,7 +159,7 @@ LL | match c {
159159
LL | c2 => {
160160
| -- value moved here
161161
LL | c.0 = 2; //~ ERROR assign to part of moved value
162-
| ^^^^^^^ value partially assigned here after partial move
162+
| ^^^^^^^ value partially assigned here after move
163163

164164
error[E0382]: assign to part of moved value: `c`
165165
--> $DIR/issue-21232-partial-init-and-use.rs:269:13

‎src/test/ui/try-block/try-block-bad-lifetime.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ LL | Err(k) ?;
3232
| - value moved here
3333
...
3434
LL | ::std::mem::drop(k); //~ ERROR use of moved value: `k`
35-
| ^ value used here after partial move
35+
| ^ value used here after move
3636

3737
error[E0506]: cannot assign to `i` because it is borrowed
3838
--> $DIR/try-block-bad-lifetime.rs:32:9

‎src/test/ui/try-block/try-block-maybe-bad-lifetime.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ LL | ::std::mem::drop(x);
2020
| - value moved here
2121
LL | };
2222
LL | println!("{}", x); //~ ERROR borrow of moved value: `x`
23-
| ^ value borrowed here after partial move
23+
| ^ value borrowed here after move
2424

2525
error[E0506]: cannot assign to `i` because it is borrowed
2626
--> $DIR/try-block-maybe-bad-lifetime.rs:40:9

0 commit comments

Comments
 (0)