Skip to content

Commit af93c20

Browse files
oli-obkoli-obk
committed
Rename lots of files that had generator in their name
1 parent 8c66e11 commit af93c20

File tree

63 files changed

+81
-81
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+81
-81
lines changed

‎src/tools/miri/tests/fail/generator-pinned-moved.rs renamed to ‎src/tools/miri/tests/fail/coroutine-pinned-moved.rs

File renamed without changes.

‎src/tools/miri/tests/fail/generator-pinned-moved.stderr renamed to ‎src/tools/miri/tests/fail/coroutine-pinned-moved.stderr

File renamed without changes.

‎src/tools/miri/tests/pass/stacked-borrows/generators-self-referential.rs renamed to ‎src/tools/miri/tests/pass/stacked-borrows/coroutine-self-referential.rs

File renamed without changes.

‎src/tools/rustfmt/tests/source/immovable_generators.rs renamed to ‎src/tools/rustfmt/tests/source/immovable_coroutines.rs

File renamed without changes.

‎src/tools/rustfmt/tests/target/immovable_generators.rs renamed to ‎src/tools/rustfmt/tests/target/immovable_coroutines.rs

File renamed without changes.

‎tests/codegen/generator-debug-msvc.rs renamed to ‎tests/codegen/coroutine-debug-msvc.rs

File renamed without changes.

‎tests/codegen/generator-debug.rs renamed to ‎tests/codegen/coroutine-debug.rs

File renamed without changes.

‎tests/coverage-map/status-quo/generator.cov-map renamed to ‎tests/coverage-map/status-quo/coroutine.cov-map

File renamed without changes.

‎tests/coverage-map/status-quo/generator.rs renamed to ‎tests/coverage-map/status-quo/coroutine.rs

File renamed without changes.

‎tests/run-coverage/generator.coverage renamed to ‎tests/run-coverage/coroutine.coverage

File renamed without changes.

‎tests/ui/async-await/generator-desc.rs renamed to ‎tests/ui/async-await/coroutine-desc.rs

File renamed without changes.

‎tests/ui/async-await/generator-desc.stderr renamed to ‎tests/ui/async-await/coroutine-desc.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
error[E0308]: mismatched types
2-
--> $DIR/generator-desc.rs:10:19
2+
--> $DIR/coroutine-desc.rs:10:19
33
|
44
LL | fun(async {}, async {});
55
| --- -------- ^^^^^^^^ expected `async` block, found a different `async` block
66
| | |
77
| | the expected `async` block
88
| arguments to this function are incorrect
99
|
10-
= note: expected `async` block `{async block@$DIR/generator-desc.rs:10:9: 10:17}`
11-
found `async` block `{async block@$DIR/generator-desc.rs:10:19: 10:27}`
10+
= note: expected `async` block `{async block@$DIR/coroutine-desc.rs:10:9: 10:17}`
11+
found `async` block `{async block@$DIR/coroutine-desc.rs:10:19: 10:27}`
1212
note: function defined here
13-
--> $DIR/generator-desc.rs:8:4
13+
--> $DIR/coroutine-desc.rs:8:4
1414
|
1515
LL | fn fun<F: Future<Output = ()>>(f1: F, f2: F) {}
1616
| ^^^ -----
1717

1818
error[E0308]: mismatched types
19-
--> $DIR/generator-desc.rs:12:16
19+
--> $DIR/coroutine-desc.rs:12:16
2020
|
2121
LL | fun(one(), two());
2222
| --- ^^^^^ expected future, found a different future
@@ -26,24 +26,24 @@ LL | fun(one(), two());
2626
= help: consider `await`ing on both `Future`s
2727
= note: distinct uses of `impl Trait` result in different opaque types
2828
note: function defined here
29-
--> $DIR/generator-desc.rs:8:4
29+
--> $DIR/coroutine-desc.rs:8:4
3030
|
3131
LL | fn fun<F: Future<Output = ()>>(f1: F, f2: F) {}
3232
| ^^^ -----
3333

3434
error[E0308]: mismatched types
35-
--> $DIR/generator-desc.rs:14:26
35+
--> $DIR/coroutine-desc.rs:14:26
3636
|
3737
LL | fun((async || {})(), (async || {})());
3838
| --- -- ^^^^^^^^^^^^^^^ expected `async` closure body, found a different `async` closure body
3939
| | |
4040
| | the expected `async` closure body
4141
| arguments to this function are incorrect
4242
|
43-
= note: expected `async` closure body `{async closure body@$DIR/generator-desc.rs:14:19: 14:21}`
44-
found `async` closure body `{async closure body@$DIR/generator-desc.rs:14:36: 14:38}`
43+
= note: expected `async` closure body `{async closure body@$DIR/coroutine-desc.rs:14:19: 14:21}`
44+
found `async` closure body `{async closure body@$DIR/coroutine-desc.rs:14:36: 14:38}`
4545
note: function defined here
46-
--> $DIR/generator-desc.rs:8:4
46+
--> $DIR/coroutine-desc.rs:8:4
4747
|
4848
LL | fn fun<F: Future<Output = ()>>(f1: F, f2: F) {}
4949
| ^^^ -----

‎tests/ui/async-await/generator-not-future.rs renamed to ‎tests/ui/async-await/coroutine-not-future.rs

File renamed without changes.

‎tests/ui/async-await/generator-not-future.stderr renamed to ‎tests/ui/async-await/coroutine-not-future.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
error[E0277]: the trait bound `impl Future<Output = ()>: Coroutine<_>` is not satisfied
2-
--> $DIR/generator-not-future.rs:31:21
2+
--> $DIR/coroutine-not-future.rs:31:21
33
|
44
LL | takes_coroutine(async_fn());
55
| --------------- ^^^^^^^^^^ the trait `Coroutine<_>` is not implemented for `impl Future<Output = ()>`
66
| |
77
| required by a bound introduced by this call
88
|
99
note: required by a bound in `takes_coroutine`
10-
--> $DIR/generator-not-future.rs:18:39
10+
--> $DIR/coroutine-not-future.rs:18:39
1111
|
1212
LL | fn takes_coroutine<ResumeTy>(_g: impl Coroutine<ResumeTy, Yield = (), Return = ()>) {}
1313
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `takes_coroutine`
1414

1515
error[E0277]: the trait bound `impl Future<Output = ()>: Coroutine<_>` is not satisfied
16-
--> $DIR/generator-not-future.rs:33:21
16+
--> $DIR/coroutine-not-future.rs:33:21
1717
|
1818
LL | takes_coroutine(returns_async_block());
1919
| --------------- ^^^^^^^^^^^^^^^^^^^^^ the trait `Coroutine<_>` is not implemented for `impl Future<Output = ()>`
2020
| |
2121
| required by a bound introduced by this call
2222
|
2323
note: required by a bound in `takes_coroutine`
24-
--> $DIR/generator-not-future.rs:18:39
24+
--> $DIR/coroutine-not-future.rs:18:39
2525
|
2626
LL | fn takes_coroutine<ResumeTy>(_g: impl Coroutine<ResumeTy, Yield = (), Return = ()>) {}
2727
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `takes_coroutine`
2828

29-
error[E0277]: the trait bound `{async block@$DIR/generator-not-future.rs:35:21: 35:29}: Coroutine<_>` is not satisfied
30-
--> $DIR/generator-not-future.rs:35:21
29+
error[E0277]: the trait bound `{async block@$DIR/coroutine-not-future.rs:35:21: 35:29}: Coroutine<_>` is not satisfied
30+
--> $DIR/coroutine-not-future.rs:35:21
3131
|
3232
LL | takes_coroutine(async {});
33-
| --------------- ^^^^^^^^ the trait `Coroutine<_>` is not implemented for `{async block@$DIR/generator-not-future.rs:35:21: 35:29}`
33+
| --------------- ^^^^^^^^ the trait `Coroutine<_>` is not implemented for `{async block@$DIR/coroutine-not-future.rs:35:21: 35:29}`
3434
| |
3535
| required by a bound introduced by this call
3636
|
3737
note: required by a bound in `takes_coroutine`
38-
--> $DIR/generator-not-future.rs:18:39
38+
--> $DIR/coroutine-not-future.rs:18:39
3939
|
4040
LL | fn takes_coroutine<ResumeTy>(_g: impl Coroutine<ResumeTy, Yield = (), Return = ()>) {}
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ required by this bound in `takes_coroutine`
4242

4343
error[E0277]: `impl Coroutine<Yield = (), Return = ()>` is not a future
44-
--> $DIR/generator-not-future.rs:39:18
44+
--> $DIR/coroutine-not-future.rs:39:18
4545
|
4646
LL | takes_future(returns_coroutine());
4747
| ------------ ^^^^^^^^^^^^^^^^^^^ `impl Coroutine<Yield = (), Return = ()>` is not a future
@@ -51,13 +51,13 @@ LL | takes_future(returns_coroutine());
5151
= help: the trait `Future` is not implemented for `impl Coroutine<Yield = (), Return = ()>`
5252
= note: impl Coroutine<Yield = (), Return = ()> must be a future or must implement `IntoFuture` to be awaited
5353
note: required by a bound in `takes_future`
54-
--> $DIR/generator-not-future.rs:17:26
54+
--> $DIR/coroutine-not-future.rs:17:26
5555
|
5656
LL | fn takes_future(_f: impl Future<Output = ()>) {}
5757
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `takes_future`
5858

59-
error[E0277]: `{coroutine@$DIR/generator-not-future.rs:41:18: 41:23}` is not a future
60-
--> $DIR/generator-not-future.rs:41:18
59+
error[E0277]: `{coroutine@$DIR/coroutine-not-future.rs:41:18: 41:23}` is not a future
60+
--> $DIR/coroutine-not-future.rs:41:18
6161
|
6262
LL | takes_future(|ctx| {
6363
| _____------------_^
@@ -66,12 +66,12 @@ LL | takes_future(|ctx| {
6666
LL | |
6767
LL | | ctx = yield ();
6868
LL | | });
69-
| |_____^ `{coroutine@$DIR/generator-not-future.rs:41:18: 41:23}` is not a future
69+
| |_____^ `{coroutine@$DIR/coroutine-not-future.rs:41:18: 41:23}` is not a future
7070
|
71-
= help: the trait `Future` is not implemented for `{coroutine@$DIR/generator-not-future.rs:41:18: 41:23}`
72-
= note: {coroutine@$DIR/generator-not-future.rs:41:18: 41:23} must be a future or must implement `IntoFuture` to be awaited
71+
= help: the trait `Future` is not implemented for `{coroutine@$DIR/coroutine-not-future.rs:41:18: 41:23}`
72+
= note: {coroutine@$DIR/coroutine-not-future.rs:41:18: 41:23} must be a future or must implement `IntoFuture` to be awaited
7373
note: required by a bound in `takes_future`
74-
--> $DIR/generator-not-future.rs:17:26
74+
--> $DIR/coroutine-not-future.rs:17:26
7575
|
7676
LL | fn takes_future(_f: impl Future<Output = ()>) {}
7777
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `takes_future`

‎tests/ui/async-await/issues/issue-65419/issue-65419-generator-resume-after-completion.rs renamed to ‎tests/ui/async-await/issues/issue-65419/issue-65419-coroutine-resume-after-completion.rs

File renamed without changes.

‎tests/ui/coherence/coherence-with-generator.rs renamed to ‎tests/ui/coherence/coherence-with-coroutine.rs

File renamed without changes.

‎tests/ui/coherence/coherence-with-generator.stock.stderr renamed to ‎tests/ui/coherence/coherence-with-coroutine.stock.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<OpaqueCoroutine>`
2-
--> $DIR/coherence-with-generator.rs:21:1
2+
--> $DIR/coherence-with-coroutine.rs:21:1
33
|
44
LL | impl Trait for Wrapper<OpaqueCoroutine> {}
55
| --------------------------------------- first implementation here

‎tests/ui/generator/async-generator-issue-67158.rs renamed to ‎tests/ui/generator/async-coroutine-issue-67158.rs

File renamed without changes.

‎tests/ui/generator/async-generator-issue-67158.stderr renamed to ‎tests/ui/generator/async-coroutine-issue-67158.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0727]: `async` coroutines are not yet supported
2-
--> $DIR/async-generator-issue-67158.rs:5:13
2+
--> $DIR/async-coroutine-issue-67158.rs:5:13
33
|
44
LL | async { yield print!(":C") };
55
| ^^^^^^^^^^^^^^^^^^

‎tests/ui/generator/generator-region-requirements.migrate.stderr renamed to ‎tests/ui/generator/coroutine-region-requirements.migrate.stderr

File renamed without changes.

‎tests/ui/generator/generator-region-requirements.rs renamed to ‎tests/ui/generator/coroutine-region-requirements.rs

File renamed without changes.

‎tests/ui/generator/generator-region-requirements.stderr renamed to ‎tests/ui/generator/coroutine-region-requirements.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetime may not live long enough
2-
--> $DIR/generator-region-requirements.rs:12:51
2+
--> $DIR/coroutine-region-requirements.rs:12:51
33
|
44
LL | fn dangle(x: &mut i32) -> &'static mut i32 {
55
| - let's call the lifetime of this reference `'1`

‎tests/ui/generator/generator-resume-after-panic.rs renamed to ‎tests/ui/generator/coroutine-resume-after-panic.rs

File renamed without changes.

‎tests/ui/generator/generator-with-nll.rs renamed to ‎tests/ui/generator/coroutine-with-nll.rs

File renamed without changes.

‎tests/ui/generator/generator-with-nll.stderr renamed to ‎tests/ui/generator/coroutine-with-nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0626]: borrow may still be in use when coroutine yields
2-
--> $DIR/generator-with-nll.rs:7:17
2+
--> $DIR/coroutine-with-nll.rs:7:17
33
|
44
LL | let b = &mut true;
55
| ^^^^^^^^^

‎tests/ui/generator/generator-yielding-or-returning-itself.rs renamed to ‎tests/ui/generator/coroutine-yielding-or-returning-itself.rs

File renamed without changes.

‎tests/ui/generator/generator-yielding-or-returning-itself.stderr renamed to ‎tests/ui/generator/coroutine-yielding-or-returning-itself.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
error[E0271]: type mismatch resolving `<{coroutine@$DIR/generator-yielding-or-returning-itself.rs:15:34: 15:36} as Coroutine>::Return == {coroutine@$DIR/generator-yielding-or-returning-itself.rs:15:34: 15:36}`
2-
--> $DIR/generator-yielding-or-returning-itself.rs:15:34
1+
error[E0271]: type mismatch resolving `<{coroutine@$DIR/coroutine-yielding-or-returning-itself.rs:15:34: 15:36} as Coroutine>::Return == {coroutine@$DIR/coroutine-yielding-or-returning-itself.rs:15:34: 15:36}`
2+
--> $DIR/coroutine-yielding-or-returning-itself.rs:15:34
33
|
44
LL | want_cyclic_coroutine_return(|| {
55
| _____----------------------------_^
@@ -16,15 +16,15 @@ LL | | })
1616
see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
1717
for more information
1818
note: required by a bound in `want_cyclic_coroutine_return`
19-
--> $DIR/generator-yielding-or-returning-itself.rs:10:36
19+
--> $DIR/coroutine-yielding-or-returning-itself.rs:10:36
2020
|
2121
LL | pub fn want_cyclic_coroutine_return<T>(_: T)
2222
| ---------------------------- required by a bound in this function
2323
LL | where T: Coroutine<Yield = (), Return = T>
2424
| ^^^^^^^^^^ required by this bound in `want_cyclic_coroutine_return`
2525

26-
error[E0271]: type mismatch resolving `<{coroutine@$DIR/generator-yielding-or-returning-itself.rs:28:33: 28:35} as Coroutine>::Yield == {coroutine@$DIR/generator-yielding-or-returning-itself.rs:28:33: 28:35}`
27-
--> $DIR/generator-yielding-or-returning-itself.rs:28:33
26+
error[E0271]: type mismatch resolving `<{coroutine@$DIR/coroutine-yielding-or-returning-itself.rs:28:33: 28:35} as Coroutine>::Yield == {coroutine@$DIR/coroutine-yielding-or-returning-itself.rs:28:33: 28:35}`
27+
--> $DIR/coroutine-yielding-or-returning-itself.rs:28:33
2828
|
2929
LL | want_cyclic_coroutine_yield(|| {
3030
| _____---------------------------_^
@@ -41,7 +41,7 @@ LL | | })
4141
see issue #46062 <https://github.com/rust-lang/rust/issues/46062>
4242
for more information
4343
note: required by a bound in `want_cyclic_coroutine_yield`
44-
--> $DIR/generator-yielding-or-returning-itself.rs:23:24
44+
--> $DIR/coroutine-yielding-or-returning-itself.rs:23:24
4545
|
4646
LL | pub fn want_cyclic_coroutine_yield<T>(_: T)
4747
| --------------------------- required by a bound in this function

‎tests/ui/generator/issue-110929-generator-conflict-error-ice.rs renamed to ‎tests/ui/generator/issue-110929-coroutine-conflict-error-ice.rs

File renamed without changes.

‎tests/ui/generator/issue-110929-generator-conflict-error-ice.stderr renamed to ‎tests/ui/generator/issue-110929-coroutine-conflict-error-ice.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0499]: cannot borrow `*x` as mutable more than once at a time
2-
--> $DIR/issue-110929-generator-conflict-error-ice.rs:8:9
2+
--> $DIR/issue-110929-coroutine-conflict-error-ice.rs:8:9
33
|
44
LL | let _c = || yield *&mut *x;
55
| -- -- first borrow occurs due to use of `*x` in coroutine

‎tests/ui/generator/issue-45729-unsafe-in-generator.mir.stderr renamed to ‎tests/ui/generator/issue-45729-unsafe-in-coroutine.mir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block
2-
--> $DIR/issue-45729-unsafe-in-generator.rs:8:9
2+
--> $DIR/issue-45729-unsafe-in-coroutine.rs:8:9
33
|
44
LL | *(1 as *mut u32) = 42;
55
| ^^^^^^^^^^^^^^^^^^^^^ dereference of raw pointer

‎tests/ui/generator/issue-45729-unsafe-in-generator.rs renamed to ‎tests/ui/generator/issue-45729-unsafe-in-coroutine.rs

File renamed without changes.

‎tests/ui/generator/issue-45729-unsafe-in-generator.thir.stderr renamed to ‎tests/ui/generator/issue-45729-unsafe-in-coroutine.thir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block
2-
--> $DIR/issue-45729-unsafe-in-generator.rs:8:9
2+
--> $DIR/issue-45729-unsafe-in-coroutine.rs:8:9
33
|
44
LL | *(1 as *mut u32) = 42;
55
| ^^^^^^^^^^^^^^^^ dereference of raw pointer

‎tests/ui/generator/nested_generators.rs renamed to ‎tests/ui/generator/nested_coroutine.rs

File renamed without changes.

‎tests/ui/generator/niche-in-generator.rs renamed to ‎tests/ui/generator/niche-in-coroutine.rs

File renamed without changes.

‎tests/ui/generator/pin-box-generator.rs renamed to ‎tests/ui/generator/pin-box-coroutine.rs

File renamed without changes.

‎tests/ui/generator/print/generator-print-verbose-1.rs renamed to ‎tests/ui/generator/print/coroutine-print-verbose-1.rs

File renamed without changes.

‎tests/ui/generator/print/generator-print-verbose-1.stderr renamed to ‎tests/ui/generator/print/coroutine-print-verbose-1.stderr

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
error: coroutine cannot be sent between threads safely
2-
--> $DIR/generator-print-verbose-1.rs:37:5
2+
--> $DIR/coroutine-print-verbose-1.rs:37:5
33
|
44
LL | require_send(send_gen);
55
| ^^^^^^^^^^^^ coroutine is not `Send`
66
|
77
= help: the trait `Sync` is not implemented for `RefCell<i32>`
88
= note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead
99
note: coroutine is not `Send` as this value is used across a yield
10-
--> $DIR/generator-print-verbose-1.rs:35:9
10+
--> $DIR/coroutine-print-verbose-1.rs:35:9
1111
|
1212
LL | let _non_send_gen = make_non_send_coroutine();
13-
| ------------- has type `Opaque(DefId(0:34 ~ generator_print_verbose_1[7d1d]::make_non_send_coroutine::{opaque#0}), [])` which is not `Send`
13+
| ------------- has type `Opaque(DefId(0:34 ~ coroutine_print_verbose_1[75fb]::make_non_send_coroutine::{opaque#0}), [])` which is not `Send`
1414
LL | yield;
1515
| ^^^^^ yield occurs here, with `_non_send_gen` maybe used later
1616
note: required by a bound in `require_send`
17-
--> $DIR/generator-print-verbose-1.rs:26:25
17+
--> $DIR/coroutine-print-verbose-1.rs:26:25
1818
|
1919
LL | fn require_send(_: impl Send) {}
2020
| ^^^^ required by this bound in `require_send`
2121

2222
error[E0277]: `RefCell<i32>` cannot be shared between threads safely
23-
--> $DIR/generator-print-verbose-1.rs:56:5
23+
--> $DIR/coroutine-print-verbose-1.rs:56:5
2424
|
2525
LL | require_send(send_gen);
2626
| ^^^^^^^^^^^^ `RefCell<i32>` cannot be shared between threads safely
@@ -29,28 +29,28 @@ LL | require_send(send_gen);
2929
= note: if you want to do aliasing and mutation between multiple threads, use `std::sync::RwLock` instead
3030
= note: required for `Arc<RefCell<i32>>` to implement `Send`
3131
note: required because it's used within this coroutine
32-
--> $DIR/generator-print-verbose-1.rs:42:5
32+
--> $DIR/coroutine-print-verbose-1.rs:42:5
3333
|
3434
LL | || {
3535
| ^^
36-
note: required because it appears within the type `Opaque(DefId(0:35 ~ generator_print_verbose_1[7d1d]::make_gen2::{opaque#0}), [Arc<RefCell<i32>>])`
37-
--> $DIR/generator-print-verbose-1.rs:41:30
36+
note: required because it appears within the type `Opaque(DefId(0:35 ~ coroutine_print_verbose_1[75fb]::make_gen2::{opaque#0}), [Arc<RefCell<i32>>])`
37+
--> $DIR/coroutine-print-verbose-1.rs:41:30
3838
|
3939
LL | pub fn make_gen2<T>(t: T) -> impl Coroutine<Return = T> {
4040
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
41-
note: required because it appears within the type `Opaque(DefId(0:36 ~ generator_print_verbose_1[7d1d]::make_non_send_coroutine2::{opaque#0}), [])`
42-
--> $DIR/generator-print-verbose-1.rs:47:34
41+
note: required because it appears within the type `Opaque(DefId(0:36 ~ coroutine_print_verbose_1[75fb]::make_non_send_coroutine2::{opaque#0}), [])`
42+
--> $DIR/coroutine-print-verbose-1.rs:47:34
4343
|
4444
LL | fn make_non_send_coroutine2() -> impl Coroutine<Return = Arc<RefCell<i32>>> {
4545
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
46-
= note: required because it captures the following types: `Opaque(DefId(0:36 ~ generator_print_verbose_1[7d1d]::make_non_send_coroutine2::{opaque#0}), [])`
46+
= note: required because it captures the following types: `Opaque(DefId(0:36 ~ coroutine_print_verbose_1[75fb]::make_non_send_coroutine2::{opaque#0}), [])`
4747
note: required because it's used within this coroutine
48-
--> $DIR/generator-print-verbose-1.rs:52:20
48+
--> $DIR/coroutine-print-verbose-1.rs:52:20
4949
|
5050
LL | let send_gen = || {
5151
| ^^
5252
note: required by a bound in `require_send`
53-
--> $DIR/generator-print-verbose-1.rs:26:25
53+
--> $DIR/coroutine-print-verbose-1.rs:26:25
5454
|
5555
LL | fn require_send(_: impl Send) {}
5656
| ^^^^ required by this bound in `require_send`

‎tests/ui/generator/print/generator-print-verbose-2.rs renamed to ‎tests/ui/generator/print/coroutine-print-verbose-2.rs

File renamed without changes.

‎tests/ui/generator/print/generator-print-verbose-2.stderr renamed to ‎tests/ui/generator/print/coroutine-print-verbose-2.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
error: coroutine cannot be shared between threads safely
2-
--> $DIR/generator-print-verbose-2.rs:17:5
2+
--> $DIR/coroutine-print-verbose-2.rs:17:5
33
|
44
LL | assert_sync(|| {
55
| ^^^^^^^^^^^ coroutine is not `Sync`
66
|
77
= help: within `{main::{closure#0} upvar_tys=() {main::{closure#0}}}`, the trait `Sync` is not implemented for `NotSync`
88
note: coroutine is not `Sync` as this value is used across a yield
9-
--> $DIR/generator-print-verbose-2.rs:20:9
9+
--> $DIR/coroutine-print-verbose-2.rs:20:9
1010
|
1111
LL | let a = NotSync;
1212
| - has type `NotSync` which is not `Sync`
1313
LL | yield;
1414
| ^^^^^ yield occurs here, with `a` maybe used later
1515
note: required by a bound in `assert_sync`
16-
--> $DIR/generator-print-verbose-2.rs:14:23
16+
--> $DIR/coroutine-print-verbose-2.rs:14:23
1717
|
1818
LL | fn assert_sync<T: Sync>(_: T) {}
1919
| ^^^^ required by this bound in `assert_sync`
2020

2121
error: coroutine cannot be sent between threads safely
22-
--> $DIR/generator-print-verbose-2.rs:24:5
22+
--> $DIR/coroutine-print-verbose-2.rs:24:5
2323
|
2424
LL | assert_send(|| {
2525
| ^^^^^^^^^^^ coroutine is not `Send`
2626
|
2727
= help: within `{main::{closure#1} upvar_tys=() {main::{closure#1}}}`, the trait `Send` is not implemented for `NotSend`
2828
note: coroutine is not `Send` as this value is used across a yield
29-
--> $DIR/generator-print-verbose-2.rs:27:9
29+
--> $DIR/coroutine-print-verbose-2.rs:27:9
3030
|
3131
LL | let a = NotSend;
3232
| - has type `NotSend` which is not `Send`
3333
LL | yield;
3434
| ^^^^^ yield occurs here, with `a` maybe used later
3535
note: required by a bound in `assert_send`
36-
--> $DIR/generator-print-verbose-2.rs:15:23
36+
--> $DIR/coroutine-print-verbose-2.rs:15:23
3737
|
3838
LL | fn assert_send<T: Send>(_: T) {}
3939
| ^^^^ required by this bound in `assert_send`

‎tests/ui/generator/print/generator-print-verbose-3.rs renamed to ‎tests/ui/generator/print/coroutine-print-verbose-3.rs

File renamed without changes.

‎tests/ui/generator/print/generator-print-verbose-3.stderr renamed to ‎tests/ui/generator/print/coroutine-print-verbose-3.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/generator-print-verbose-3.rs:7:25
2+
--> $DIR/coroutine-print-verbose-3.rs:7:25
33
|
44
LL | let coroutine :() = || {
55
| ____________________--___^

‎tests/ui/generator/static-generators.rs renamed to ‎tests/ui/generator/static-coroutine.rs

File renamed without changes.

‎tests/ui/generator/yield-outside-generator-issue-78653.rs renamed to ‎tests/ui/generator/yield-outside-coroutine-issue-78653.rs

File renamed without changes.

‎tests/ui/generator/yield-outside-generator-issue-78653.stderr renamed to ‎tests/ui/generator/yield-outside-coroutine-issue-78653.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error[E0627]: yield expression outside of coroutine literal
2-
--> $DIR/yield-outside-generator-issue-78653.rs:4:5
2+
--> $DIR/yield-outside-coroutine-issue-78653.rs:4:5
33
|
44
LL | yield || for i in 0 { }
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66

77
error[E0277]: `{integer}` is not an iterator
8-
--> $DIR/yield-outside-generator-issue-78653.rs:4:23
8+
--> $DIR/yield-outside-coroutine-issue-78653.rs:4:23
99
|
1010
LL | yield || for i in 0 { }
1111
| ^ `{integer}` is not an iterator

‎tests/ui/impl-trait/recursive-generator.rs renamed to ‎tests/ui/impl-trait/recursive-coroutine.rs

File renamed without changes.

‎tests/ui/impl-trait/recursive-generator.stderr renamed to ‎tests/ui/impl-trait/recursive-coroutine.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0720]: cannot resolve opaque type
2-
--> $DIR/recursive-generator.rs:5:13
2+
--> $DIR/recursive-coroutine.rs:5:13
33
|
44
LL | fn foo() -> impl Coroutine<Yield = (), Return = ()> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive opaque type

‎tests/ui/nll/generator-distinct-lifetime.rs renamed to ‎tests/ui/nll/coroutine-distinct-lifetime.rs

File renamed without changes.

‎tests/ui/nll/generator-upvar-mutability.rs renamed to ‎tests/ui/nll/coroutine-upvar-mutability.rs

File renamed without changes.

‎tests/ui/nll/generator-upvar-mutability.stderr renamed to ‎tests/ui/nll/coroutine-upvar-mutability.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0594]: cannot assign to `x`, as it is not declared as mutable
2-
--> $DIR/generator-upvar-mutability.rs:8:9
2+
--> $DIR/coroutine-upvar-mutability.rs:8:9
33
|
44
LL | let x = 0;
55
| - help: consider changing this to be mutable: `mut x`

‎tests/ui/nll/issue-48623-generator.rs renamed to ‎tests/ui/nll/issue-48623-coroutine.rs

File renamed without changes.

‎tests/ui/nll/issue-48623-generator.stderr renamed to ‎tests/ui/nll/issue-48623-coroutine.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
warning: unused coroutine that must be used
2-
--> $DIR/issue-48623-generator.rs:15:5
2+
--> $DIR/issue-48623-coroutine.rs:15:5
33
|
44
LL | move || { d; yield; &mut *r };
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎tests/ui/polymorphization/generators.rs renamed to ‎tests/ui/polymorphization/coroutine.rs

File renamed without changes.

0 commit comments

Comments
 (0)