Suggest adding semicolon in user code rather than macro impl details #142543
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
fmease
reviewed
Jun 15, 2025
fmease
reviewed
Jun 15, 2025
fmease
approved these changes
Jun 15, 2025
This comment was marked as outdated.
This comment was marked as outdated.
This comment has been minimized.
This comment has been minimized.
ac875a1 to
6ff3713
Compare
|
@bors r=fmease |
bors
added a commit
that referenced
this pull request
Jun 16, 2025
Rollup of 10 pull requests Successful merges: - #133952 (Remove wasm legacy abi) - #134661 (Reduce precedence of expressions that have an outer attr) - #141769 (Move metadata object generation for dylibs to the linker code ) - #141937 (Report never type lints in dependencies) - #142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future) - #142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`) - #142470 (Add some missing mailmap entries) - #142481 (Add `f16` inline asm support for LoongArch) - #142499 (Remove check run bootstrap) - #142543 (Suggest adding semicolon in user code rather than macro impl details) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Jun 16, 2025
Rollup merge of #142543 - Urgau:span-borrowck-semicolon, r=fmease Suggest adding semicolon in user code rather than macro impl details This PR tries to find the right span (by peeling expansion) so that the suggestion for adding a semicolon is suggested in user code rather than in the expanded code (in the example a macro impl). Fixes #139049 r? `@fmease`
m-ou-se
reviewed
Jun 16, 2025
Comment on lines
+37
to
+42
| let _write = { | ||
| let mutex = Mutex; | ||
| write!(Out, "{}", mutex.lock()) | ||
| //~^ ERROR `mutex` does not live long enough | ||
| //~| SUGGESTION ; | ||
| }; |
There was a problem hiding this comment.
I just noticed that this test passes in Rust 2024, due to the new rules for temporaries in tail expressions.
There was a problem hiding this comment.
I just noticed that this test passes in Rust 2024
Sure, but we still want to provide non-butchered / good diagnostics in older editions, they have "long-term support".
There was a problem hiding this comment.
We could replace that test with the following one:
// Make sure the generated suggestion suggest editing the user code instead of
// the macro implementation (which might come from an external crate).
// issue: <https://github.com/rust-lang/rust/issues/139049>
// You could assume that this comes from an extern crate (it doesn't
// because an aux crate would be overkill for this test).
macro_rules! perform { ($e:expr) => { D(&$e).end() } }
fn main() {
{ let l = (); perform!(l) }; //~ ERROR does not live long enough
//~^ SUGGESTION ;
let _x = { let l = (); perform!(l) }; //~ ERROR does not live long enough
//~| SUGGESTION let x
}
struct D<T>(T);
impl<T> Drop for D<T> { fn drop(&mut self) {} }
impl<T> D<T> { fn end(&self) -> String { String::new()} }There was a problem hiding this comment.
Or modify tests/ui/nll/issue-54556-used-vs-unused-tails.rs and add it there
There was a problem hiding this comment.
@fmease That test doesn't work. Then it just suggests to add the ; inside the macro definition.
jhpratt
added a commit
to jhpratt/rust
that referenced
this pull request
Jun 17, 2025
Handle same-crate macro for borrowck semicolon suggestion Handles rust-lang#142543 (comment) cc `@m-ou-se` r? `@fmease`
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jun 17, 2025
Handle same-crate macro for borrowck semicolon suggestion Handles rust-lang#142543 (comment) cc ``@m-ou-se`` r? ``@fmease``
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Jun 17, 2025
Handle same-crate macro for borrowck semicolon suggestion Handles rust-lang#142543 (comment) cc ```@m-ou-se``` r? ```@fmease```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR tries to find the right span (by peeling expansion) so that the suggestion for adding a semicolon is suggested in user code rather than in the expanded code (in the example a macro impl).
Fixes #139049
r? @fmease