Skip to content

Commit 6431097

Browse files
m-ou-sem-ou-se
committed
Update test output.
1 parent 111201d commit 6431097

9 files changed

+44
-152
lines changed

‎src/test/ui/closures/2229_closure_analysis/migrations/auto_traits.stderr

+11-15
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ LL | #![deny(rust_2021_incompatible_closure_captures)]
1616
help: add a dummy let to cause `fptr` to be fully captured
1717
|
1818
LL ~ thread::spawn(move || { let _ = &fptr; unsafe {
19-
LL +
20-
LL +
21-
LL +
22-
LL +
23-
LL + *fptr.0 = 20;
19+
LL |
20+
LL |
21+
LL |
22+
LL |
23+
LL | *fptr.0 = 20;
2424
...
2525

2626
error: changes to closure capture in Rust 2021 will affect `Sync`, `Send` trait implementation for closure
@@ -36,11 +36,11 @@ LL | *fptr.0.0 = 20;
3636
help: add a dummy let to cause `fptr` to be fully captured
3737
|
3838
LL ~ thread::spawn(move || { let _ = &fptr; unsafe {
39-
LL +
40-
LL +
41-
LL +
42-
LL +
43-
LL + *fptr.0.0 = 20;
39+
LL |
40+
LL |
41+
LL |
42+
LL |
43+
LL | *fptr.0.0 = 20;
4444
...
4545

4646
error: changes to closure capture in Rust 2021 will affect `Clone` trait implementation for closure and drop order
@@ -60,11 +60,7 @@ help: add a dummy let to cause `f` to be fully captured
6060
|
6161
LL ~ let c = || {
6262
LL + let _ = &f;
63-
LL +
64-
LL +
65-
LL +
66-
LL +
67-
...
63+
|
6864

6965
error: aborting due to 3 previous errors
7066

‎src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop.stderr

+7-35
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ help: add a dummy let to cause `t`, `t1`, `t2` to be fully captured
3030
|
3131
LL ~ let c = || {
3232
LL + let _ = (&t, &t1, &t2);
33-
LL +
34-
LL +
35-
LL +
36-
LL +
37-
...
33+
|
3834

3935
error: changes to closure capture in Rust 2021 will affect drop order
4036
--> $DIR/insignificant_drop.rs:41:13
@@ -59,11 +55,7 @@ help: add a dummy let to cause `t`, `t1` to be fully captured
5955
|
6056
LL ~ let c = || {
6157
LL + let _ = (&t, &t1);
62-
LL +
63-
LL +
64-
LL +
65-
LL + let _t = t.0;
66-
...
58+
|
6759

6860
error: changes to closure capture in Rust 2021 will affect drop order
6961
--> $DIR/insignificant_drop.rs:62:13
@@ -82,11 +74,7 @@ help: add a dummy let to cause `t` to be fully captured
8274
|
8375
LL ~ let c = || {
8476
LL + let _ = &t;
85-
LL +
86-
LL +
87-
LL +
88-
LL + let _t = t.0;
89-
...
77+
|
9078

9179
error: changes to closure capture in Rust 2021 will affect drop order
9280
--> $DIR/insignificant_drop.rs:83:13
@@ -105,11 +93,7 @@ help: add a dummy let to cause `t` to be fully captured
10593
|
10694
LL ~ let c = || {
10795
LL + let _ = &t;
108-
LL +
109-
LL +
110-
LL +
111-
LL + let _t = t.0;
112-
...
96+
|
11397

11498
error: changes to closure capture in Rust 2021 will affect drop order
11599
--> $DIR/insignificant_drop.rs:104:13
@@ -128,11 +112,7 @@ help: add a dummy let to cause `t` to be fully captured
128112
|
129113
LL ~ let c = || {
130114
LL + let _ = &t;
131-
LL +
132-
LL +
133-
LL +
134-
LL + let _t = t.0;
135-
...
115+
|
136116

137117
error: changes to closure capture in Rust 2021 will affect drop order
138118
--> $DIR/insignificant_drop.rs:122:13
@@ -156,11 +136,7 @@ help: add a dummy let to cause `t1`, `t` to be fully captured
156136
|
157137
LL ~ let c = move || {
158138
LL + let _ = (&t1, &t);
159-
LL +
160-
LL +
161-
LL +
162-
LL + println!("{} {}", t1.1, t.1);
163-
...
139+
|
164140

165141
error: changes to closure capture in Rust 2021 will affect drop order
166142
--> $DIR/insignificant_drop.rs:142:13
@@ -179,11 +155,7 @@ help: add a dummy let to cause `t` to be fully captured
179155
|
180156
LL ~ let c = || {
181157
LL + let _ = &t;
182-
LL +
183-
LL +
184-
LL +
185-
LL + let _t = t.0;
186-
...
158+
|
187159

188160
error: aborting due to 7 previous errors
189161

‎src/test/ui/closures/2229_closure_analysis/migrations/insignificant_drop_attr_migrations.stderr

+2-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ help: add a dummy let to cause `t` to be fully captured
2020
|
2121
LL ~ let c = || {
2222
LL + let _ = &t;
23-
LL +
24-
LL +
25-
LL +
26-
LL + let _t = t.0;
27-
...
23+
|
2824

2925
error: changes to closure capture in Rust 2021 will affect drop order
3026
--> $DIR/insignificant_drop_attr_migrations.rs:57:13
@@ -43,11 +39,7 @@ help: add a dummy let to cause `t` to be fully captured
4339
|
4440
LL ~ let c = move || {
4541
LL + let _ = &t;
46-
LL +
47-
LL +
48-
LL +
49-
LL + let _t = t.1;
50-
...
42+
|
5143

5244
error: aborting due to 2 previous errors
5345

‎src/test/ui/closures/2229_closure_analysis/migrations/macro.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ LL | #![deny(rust_2021_incompatible_closure_captures)]
1818
help: add a dummy let to cause `a` to be fully captured
1919
|
2020
LL | let _ = || { let _ = &a; dbg!(a.0) };
21-
| ~~~~~~~~~~~~~~~~~~~~~~~~~
21+
| +++++++++++++ +
2222

2323
error: aborting due to previous error
2424

‎src/test/ui/closures/2229_closure_analysis/migrations/migrations_rustfix.stderr

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ help: add a dummy let to cause `t` to be fully captured
2020
|
2121
LL ~ let c = || {
2222
LL + let _ = &t;
23-
LL +
24-
LL +
25-
LL +
26-
LL + let _t = t.0;
27-
...
23+
|
2824

2925
error: changes to closure capture in Rust 2021 will affect drop order
3026
--> $DIR/migrations_rustfix.rs:33:13
@@ -41,7 +37,7 @@ LL | }
4137
help: add a dummy let to cause `t` to be fully captured
4238
|
4339
LL | let c = || { let _ = &t; t.0 };
44-
| ~~~~~~~~~~~~~~~~~~~
40+
| +++++++++++++ +
4541

4642
error: aborting due to 2 previous errors
4743

‎src/test/ui/closures/2229_closure_analysis/migrations/mir_calls_to_shims.stderr

+1-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,7 @@ help: add a dummy let to cause `f` to be fully captured
1717
|
1818
LL ~ let result = panic::catch_unwind(move || {
1919
LL + let _ = &f;
20-
LL +
21-
LL +
22-
LL +
23-
LL +
24-
...
20+
|
2521

2622
error: aborting due to previous error
2723

‎src/test/ui/closures/2229_closure_analysis/migrations/multi_diagnostics.stderr

+9-25
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ help: add a dummy let to cause `f1`, `f2` to be fully captured
2323
|
2424
LL ~ let c = || {
2525
LL + let _ = (&f1, &f2);
26-
LL +
27-
LL +
28-
LL +
29-
LL +
30-
...
26+
|
3127

3228
error: changes to closure capture in Rust 2021 will affect `Clone` trait implementation for closure
3329
--> $DIR/multi_diagnostics.rs:42:13
@@ -43,11 +39,7 @@ help: add a dummy let to cause `f1` to be fully captured
4339
|
4440
LL ~ let c = || {
4541
LL + let _ = &f1;
46-
LL +
47-
LL +
48-
LL +
49-
LL +
50-
...
42+
|
5143

5244
error: changes to closure capture in Rust 2021 will affect `Clone` trait implementation for closure
5345
--> $DIR/multi_diagnostics.rs:67:13
@@ -69,11 +61,7 @@ help: add a dummy let to cause `f1` to be fully captured
6961
|
7062
LL ~ let c = || {
7163
LL + let _ = &f1;
72-
LL +
73-
LL +
74-
LL +
75-
LL +
76-
...
64+
|
7765

7866
error: changes to closure capture in Rust 2021 will affect `Clone` trait implementation for closure and drop order
7967
--> $DIR/multi_diagnostics.rs:86:13
@@ -98,11 +86,7 @@ help: add a dummy let to cause `f1` to be fully captured
9886
|
9987
LL ~ let c = || {
10088
LL + let _ = &f1;
101-
LL +
102-
LL +
103-
LL +
104-
LL +
105-
...
89+
|
10690

10791
error: changes to closure capture in Rust 2021 will affect `Sync`, `Send` trait implementation for closure
10892
--> $DIR/multi_diagnostics.rs:119:19
@@ -123,11 +107,11 @@ LL | *fptr2.0 = 20;
123107
help: add a dummy let to cause `fptr1`, `fptr2` to be fully captured
124108
|
125109
LL ~ thread::spawn(move || { let _ = (&fptr1, &fptr2); unsafe {
126-
LL +
127-
LL +
128-
LL +
129-
LL +
130-
LL +
110+
LL |
111+
LL |
112+
LL |
113+
LL |
114+
LL |
131115
...
132116

133117
error: aborting due to 5 previous errors

‎src/test/ui/closures/2229_closure_analysis/migrations/precise.stderr

+2-10
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ help: add a dummy let to cause `t` to be fully captured
2020
|
2121
LL ~ let c = || {
2222
LL + let _ = &t;
23-
LL +
24-
LL +
25-
LL +
26-
LL + let _t = t.0;
27-
...
23+
|
2824

2925
error: changes to closure capture in Rust 2021 will affect drop order
3026
--> $DIR/precise.rs:45:13
@@ -53,11 +49,7 @@ help: add a dummy let to cause `u` to be fully captured
5349
|
5450
LL ~ let c = || {
5551
LL + let _ = &u;
56-
LL +
57-
LL +
58-
LL +
59-
LL + let _x = u.0.0;
60-
...
52+
|
6153

6254
error: aborting due to 2 previous errors
6355

0 commit comments

Comments
 (0)