Skip to content

fix suggestion in E0373 for !Unpin coroutines #125301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3343,6 +3343,10 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
} else if string.starts_with("gen") {
// `gen` is 3 chars long
Some(3)
} else if string.starts_with("static") {
// `static` is 6 chars long
// This is used for `!Unpin` coroutines
Some(6)
} else {
None
};
Expand Down
19 changes: 19 additions & 0 deletions tests/ui/coroutine/static-move-suggestion.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//@ run-rustfix

// check to make sure that we suggest adding `move` after `static`

#![feature(coroutines)]

fn check() -> impl Sized {
let x = 0;
#[coroutine]
static move || {
//~^ ERROR E0373
yield;
x
}
}

fn main() {
check();
}
19 changes: 19 additions & 0 deletions tests/ui/coroutine/static-move-suggestion.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
//@ run-rustfix

// check to make sure that we suggest adding `move` after `static`

#![feature(coroutines)]

fn check() -> impl Sized {
let x = 0;
#[coroutine]
static || {
//~^ ERROR E0373
yield;
x
}
}

fn main() {
check();
}
26 changes: 26 additions & 0 deletions tests/ui/coroutine/static-move-suggestion.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
error[E0373]: coroutine may outlive the current function, but it borrows `x`, which is owned by the current function
--> $DIR/static-move-suggestion.rs:10:5
|
LL | static || {
| ^^^^^^^^^ may outlive borrowed value `x`
...
LL | x
| - `x` is borrowed here
|
note: coroutine is returned here
--> $DIR/static-move-suggestion.rs:10:5
|
LL | / static || {
LL | |
LL | | yield;
LL | | x
LL | | }
| |_____^
help: to force the coroutine to take ownership of `x` (and any other referenced variables), use the `move` keyword
|
LL | static move || {
| ++++

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0373`.
Loading