Skip to content

Commit 4e9bcb5

Browse files
committed
Update unit test outputs
1 parent 0f367a9 commit 4e9bcb5

File tree

2 files changed

+51
-80
lines changed

2 files changed

+51
-80
lines changed

src/test/ui/generator/clone-impl-static.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error[E0277]: the trait bound `[static generator@$DIR/clone-impl-static.rs:7:15: 9:6]: Copy` is not satisfied
1+
error[E0277]: the trait bound `[static generator@$DIR/clone-impl-static.rs:7:15: 7:29]: Copy` is not satisfied
22
--> $DIR/clone-impl-static.rs:10:16
33
|
44
LL | check_copy(&gen);
5-
| ---------- ^^^^ the trait `Copy` is not implemented for `[static generator@$DIR/clone-impl-static.rs:7:15: 9:6]`
5+
| ---------- ^^^^ the trait `Copy` is not implemented for `[static generator@$DIR/clone-impl-static.rs:7:15: 7:29]`
66
| |
77
| required by a bound introduced by this call
88
|
@@ -12,11 +12,11 @@ note: required by a bound in `check_copy`
1212
LL | fn check_copy<T: Copy>(_x: &T) {}
1313
| ^^^^ required by this bound in `check_copy`
1414

15-
error[E0277]: the trait bound `[static generator@$DIR/clone-impl-static.rs:7:15: 9:6]: Clone` is not satisfied
15+
error[E0277]: the trait bound `[static generator@$DIR/clone-impl-static.rs:7:15: 7:29]: Clone` is not satisfied
1616
--> $DIR/clone-impl-static.rs:12:17
1717
|
1818
LL | check_clone(&gen);
19-
| ----------- ^^^^ the trait `Clone` is not implemented for `[static generator@$DIR/clone-impl-static.rs:7:15: 9:6]`
19+
| ----------- ^^^^ the trait `Clone` is not implemented for `[static generator@$DIR/clone-impl-static.rs:7:15: 7:29]`
2020
| |
2121
| required by a bound introduced by this call
2222
|

src/test/ui/generator/clone-impl.stderr

+47-76
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
error[E0277]: the trait bound `Vec<u32>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:36:23: 41:6]`
2-
--> $DIR/clone-impl.rs:42:5
3-
|
4-
LL | let gen_clone_0 = move || {
5-
| _______________________-
6-
LL | | let v = vec!['a'];
7-
LL | | yield;
8-
LL | | drop(v);
9-
LL | | drop(clonable_0);
10-
LL | | };
11-
| |_____- within this `[generator@$DIR/clone-impl.rs:36:23: 41:6]`
12-
LL | check_copy(&gen_clone_0);
13-
| ^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:36:23: 41:6]`, the trait `Copy` is not implemented for `Vec<u32>`
1+
error[E0277]: the trait bound `Vec<u32>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:36:23: 36:30]`
2+
--> $DIR/clone-impl.rs:42:16
3+
|
4+
LL | let gen_clone_0 = move || {
5+
| ------- within this `[generator@$DIR/clone-impl.rs:36:23: 36:30]`
6+
...
7+
LL | check_copy(&gen_clone_0);
8+
| ^^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:36:23: 36:30]`, the trait `Copy` is not implemented for `Vec<u32>`
149
|
1510
note: captured value does not implement `Copy`
1611
--> $DIR/clone-impl.rs:40:14
@@ -23,19 +18,14 @@ note: required by a bound in `check_copy`
2318
LL | fn check_copy<T: Copy>(_x: &T) {}
2419
| ^^^^ required by this bound in `check_copy`
2520

26-
error[E0277]: the trait bound `Vec<char>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:36:23: 41:6]`
27-
--> $DIR/clone-impl.rs:42:5
28-
|
29-
LL | let gen_clone_0 = move || {
30-
| _______________________-
31-
LL | | let v = vec!['a'];
32-
LL | | yield;
33-
LL | | drop(v);
34-
LL | | drop(clonable_0);
35-
LL | | };
36-
| |_____- within this `[generator@$DIR/clone-impl.rs:36:23: 41:6]`
37-
LL | check_copy(&gen_clone_0);
38-
| ^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:36:23: 41:6]`, the trait `Copy` is not implemented for `Vec<char>`
21+
error[E0277]: the trait bound `Vec<char>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:36:23: 36:30]`
22+
--> $DIR/clone-impl.rs:42:16
23+
|
24+
LL | let gen_clone_0 = move || {
25+
| ------- within this `[generator@$DIR/clone-impl.rs:36:23: 36:30]`
26+
...
27+
LL | check_copy(&gen_clone_0);
28+
| ^^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:36:23: 36:30]`, the trait `Copy` is not implemented for `Vec<char>`
3929
|
4030
note: generator does not implement `Copy` as this value is used across a yield
4131
--> $DIR/clone-impl.rs:38:9
@@ -53,20 +43,14 @@ note: required by a bound in `check_copy`
5343
LL | fn check_copy<T: Copy>(_x: &T) {}
5444
| ^^^^ required by this bound in `check_copy`
5545

56-
error[E0277]: the trait bound `Vec<u32>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:46:23: 57:6]`
57-
--> $DIR/clone-impl.rs:58:5
58-
|
59-
LL | let gen_clone_1 = move || {
60-
| _______________________-
61-
LL | | let v = vec!['a'];
62-
LL | | /*
63-
LL | | let n = NonClone;
64-
... |
65-
LL | | drop(clonable_1);
66-
LL | | };
67-
| |_____- within this `[generator@$DIR/clone-impl.rs:46:23: 57:6]`
68-
LL | check_copy(&gen_clone_1);
69-
| ^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:46:23: 57:6]`, the trait `Copy` is not implemented for `Vec<u32>`
46+
error[E0277]: the trait bound `Vec<u32>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:46:23: 46:30]`
47+
--> $DIR/clone-impl.rs:58:16
48+
|
49+
LL | let gen_clone_1 = move || {
50+
| ------- within this `[generator@$DIR/clone-impl.rs:46:23: 46:30]`
51+
...
52+
LL | check_copy(&gen_clone_1);
53+
| ^^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:46:23: 46:30]`, the trait `Copy` is not implemented for `Vec<u32>`
7054
|
7155
note: captured value does not implement `Copy`
7256
--> $DIR/clone-impl.rs:56:14
@@ -79,20 +63,14 @@ note: required by a bound in `check_copy`
7963
LL | fn check_copy<T: Copy>(_x: &T) {}
8064
| ^^^^ required by this bound in `check_copy`
8165

82-
error[E0277]: the trait bound `Vec<char>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:46:23: 57:6]`
83-
--> $DIR/clone-impl.rs:58:5
84-
|
85-
LL | let gen_clone_1 = move || {
86-
| _______________________-
87-
LL | | let v = vec!['a'];
88-
LL | | /*
89-
LL | | let n = NonClone;
90-
... |
91-
LL | | drop(clonable_1);
92-
LL | | };
93-
| |_____- within this `[generator@$DIR/clone-impl.rs:46:23: 57:6]`
94-
LL | check_copy(&gen_clone_1);
95-
| ^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:46:23: 57:6]`, the trait `Copy` is not implemented for `Vec<char>`
66+
error[E0277]: the trait bound `Vec<char>: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:46:23: 46:30]`
67+
--> $DIR/clone-impl.rs:58:16
68+
|
69+
LL | let gen_clone_1 = move || {
70+
| ------- within this `[generator@$DIR/clone-impl.rs:46:23: 46:30]`
71+
...
72+
LL | check_copy(&gen_clone_1);
73+
| ^^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:46:23: 46:30]`, the trait `Copy` is not implemented for `Vec<char>`
9674
|
9775
note: generator does not implement `Copy` as this value is used across a yield
9876
--> $DIR/clone-impl.rs:52:9
@@ -111,17 +89,14 @@ note: required by a bound in `check_copy`
11189
LL | fn check_copy<T: Copy>(_x: &T) {}
11290
| ^^^^ required by this bound in `check_copy`
11391

114-
error[E0277]: the trait bound `NonClone: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:62:25: 65:6]`
115-
--> $DIR/clone-impl.rs:66:5
116-
|
117-
LL | let gen_non_clone = move || {
118-
| _________________________-
119-
LL | | yield;
120-
LL | | drop(non_clonable);
121-
LL | | };
122-
| |_____- within this `[generator@$DIR/clone-impl.rs:62:25: 65:6]`
123-
LL | check_copy(&gen_non_clone);
124-
| ^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:62:25: 65:6]`, the trait `Copy` is not implemented for `NonClone`
92+
error[E0277]: the trait bound `NonClone: Copy` is not satisfied in `[generator@$DIR/clone-impl.rs:62:25: 62:32]`
93+
--> $DIR/clone-impl.rs:66:16
94+
|
95+
LL | let gen_non_clone = move || {
96+
| ------- within this `[generator@$DIR/clone-impl.rs:62:25: 62:32]`
97+
...
98+
LL | check_copy(&gen_non_clone);
99+
| ^^^^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:62:25: 62:32]`, the trait `Copy` is not implemented for `NonClone`
125100
|
126101
note: captured value does not implement `Copy`
127102
--> $DIR/clone-impl.rs:64:14
@@ -138,18 +113,14 @@ help: consider annotating `NonClone` with `#[derive(Copy)]`
138113
LL | #[derive(Copy)]
139114
|
140115

141-
error[E0277]: the trait bound `NonClone: Clone` is not satisfied in `[generator@$DIR/clone-impl.rs:62:25: 65:6]`
142-
--> $DIR/clone-impl.rs:68:5
143-
|
144-
LL | let gen_non_clone = move || {
145-
| _________________________-
146-
LL | | yield;
147-
LL | | drop(non_clonable);
148-
LL | | };
149-
| |_____- within this `[generator@$DIR/clone-impl.rs:62:25: 65:6]`
116+
error[E0277]: the trait bound `NonClone: Clone` is not satisfied in `[generator@$DIR/clone-impl.rs:62:25: 62:32]`
117+
--> $DIR/clone-impl.rs:68:17
118+
|
119+
LL | let gen_non_clone = move || {
120+
| ------- within this `[generator@$DIR/clone-impl.rs:62:25: 62:32]`
150121
...
151-
LL | check_clone(&gen_non_clone);
152-
| ^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:62:25: 65:6]`, the trait `Clone` is not implemented for `NonClone`
122+
LL | check_clone(&gen_non_clone);
123+
| ^^^^^^^^^^^^^^ within `[generator@$DIR/clone-impl.rs:62:25: 62:32]`, the trait `Clone` is not implemented for `NonClone`
153124
|
154125
note: captured value does not implement `Clone`
155126
--> $DIR/clone-impl.rs:64:14

0 commit comments

Comments
 (0)