Skip to content
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.

Sign up for GitHub

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

Don't suggest a semicolon when one already exists #134247

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+69 −3
Draft

Don't suggest a semicolon when one already exists #134247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1105b7f
Don't suggest a semicolon when one already exists
joculatrix Dec 13, 2024
9f62afa
Add regression test
joculatrix Dec 13, 2024
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
Prev Previous commit
Add regression test
  • Loading branch information
@joculatrix
joculatrix committed Dec 13, 2024
commit 9f62afa53e182e3d682d855694f73af31d769986
31 changes: 31 additions & 0 deletions tests/ui/borrowck/do-not-suggest-duplicate-semicolons-issue-133941.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Regression test for #133941: Don't suggest adding a semicolon during borrowck
// errors when one already exists.

use std::marker::PhantomData;

struct Bar<'a>(PhantomData<&'a mut i32>);

impl<'a> Drop for Bar<'a> {
fn drop(&mut self) {}
}

struct Foo();

impl Foo {
fn f(&mut self) -> Option<Bar<'_>> {
None
}

fn g(&mut self) {}
}

fn main() {
let mut foo = Foo();
while let Some(_) = foo.f() {
//~^ NOTE first mutable borrow occurs here
//~| a temporary with access to the first borrow is created here ...
foo.g(); //~ ERROR cannot borrow `foo` as mutable more than once at a time
//~^ second mutable borrow occurs here
};
//~^ ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`
}
18 changes: 18 additions & 0 deletions tests/ui/borrowck/do-not-suggest-duplicate-semicolons-issue-133941.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
error[E0499]: cannot borrow `foo` as mutable more than once at a time
--> $DIR/do-not-suggest-duplicate-semicolons-issue-133941.rs:27:9
|
LL | while let Some(_) = foo.f() {
| -------
| |
| first mutable borrow occurs here
| a temporary with access to the first borrow is created here ...
...
LL | foo.g();
| ^^^ second mutable borrow occurs here
LL |
LL | };
| - ... and the first borrow might be used here, when that temporary is dropped and runs the destructor for type `Option<Bar<'_>>`

error: aborting due to 1 previous error

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