-
-
Notifications
You must be signed in to change notification settings - Fork 15k
Don't emit unused_parens suggestion for proc-macro-synthesized parens around bounds
#157692
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
Open
sanidhyasin
wants to merge
1
commit into
rust-lang:main
Choose a base branch
from
sanidhyasin:fix-unused-parens-proc-macro-span
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+90
−13
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
32 changes: 32 additions & 0 deletions
32
tests/ui/lint/unused/auxiliary/unused-parens-bound-proc-macro.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| extern crate proc_macro; | ||
|
|
||
| use proc_macro::{Group, Span, TokenStream, TokenTree}; | ||
|
|
||
| // Recursively overwrite the span of every token (including group delimiters) | ||
| // with `span`. | ||
| fn respan(span: Span, stream: TokenStream) -> TokenStream { | ||
| stream | ||
| .into_iter() | ||
| .map(|tt| match tt { | ||
| TokenTree::Group(group) => { | ||
| let mut group = Group::new(group.delimiter(), respan(span, group.stream())); | ||
| group.set_span(span); | ||
| TokenTree::Group(group) | ||
| } | ||
| mut tt => { | ||
| tt.set_span(span); | ||
| tt | ||
| } | ||
| }) | ||
| .collect() | ||
| } | ||
|
|
||
| /// Emits `const _: &dyn (Send) = &();` with every token carrying the span of the | ||
| /// macro's first input token. The parenthesized trait-object bound is therefore | ||
| /// reported at a span that does not actually contain parentheses in the source. | ||
| #[proc_macro] | ||
| pub fn emit_parenthesized_bound(input: TokenStream) -> TokenStream { | ||
| let span = input.into_iter().next().unwrap().span(); | ||
| let code: TokenStream = "const _: &dyn (Send) = &();".parse().unwrap(); | ||
| respan(span, code) | ||
| } |
25 changes: 25 additions & 0 deletions
25
tests/ui/lint/unused/unused-parens-trait-obj-proc-macro-144378.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| //@ check-pass | ||
| //@ edition: 2021 | ||
| //@ proc-macro: unused-parens-bound-proc-macro.rs | ||
|
|
||
| // Regression test for #144378. | ||
| // | ||
| // A proc-macro can synthesize parentheses around a trait-object bound while | ||
| // reusing a span from its input. That span does not actually point at the | ||
| // parentheses, so the `unused_parens` lint must not blindly trim its first and | ||
| // last byte: doing so produced an invalid suggestion (e.g. turning a field | ||
| // `val: u8` into `al: u`) and, when the reused span started or ended on a | ||
| // multibyte character, ICEd by slicing through that character. | ||
|
|
||
| #![deny(unused_parens)] | ||
| #![allow(uncommon_codepoints)] | ||
|
|
||
| extern crate unused_parens_bound_proc_macro; | ||
|
|
||
| // The generated `&dyn (Send)` reuses the span of the identifier `é`, whose | ||
| // first byte is the start of a two-byte character. Before the fix, trimming one | ||
| // byte off the front of that span sliced through `é` and ICEd; now the lint is | ||
| // skipped because the source span is not wrapped in parentheses. | ||
| unused_parens_bound_proc_macro::emit_parenthesized_bound!(é); | ||
|
|
||
| fn main() {} |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please pare down this entire comment as well. It can just be a single sentence like "check that there's actually braces where we are expecting them to be, in case a macro does weird things with spans or parser recovery happens"