Skip to content

Recover on attribute in use tree#155254

Open
scrabsha wants to merge 2 commits into
rust-lang:mainfrom
scrabsha:push-qlmmuuwqnoqv
Open

Recover on attribute in use tree#155254
scrabsha wants to merge 2 commits into
rust-lang:mainfrom
scrabsha:push-qlmmuuwqnoqv

Conversation

@scrabsha

@scrabsha scrabsha commented Apr 13, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

View all comments

Renders as:

This requires passing two more arguments to Parser::parse_use_tree and I'm not super happy about it. I did consider adding more context to Parser instead, but that did not sound like a good idea. Happy to rework my code to make it less ugly :)

I am also not very happy that the deletion shows up as a green ~ in the suggestion. I tried very hard to make it render properly but failed. I am not sure it's actually possible but would love to be proven wrong hehe

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 13, 2026
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@scrabsha scrabsha force-pushed the push-qlmmuuwqnoqv branch from 291ff75 to 290c04c Compare April 13, 2026 19:54
fmease
fmease reviewed Apr 13, 2026
View reviewed changes
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
@scrabsha scrabsha force-pushed the push-qlmmuuwqnoqv branch from 290c04c to 83f6ae9 Compare April 14, 2026 20:11
@scrabsha

scrabsha commented Apr 14, 2026

Copy link
Copy Markdown
Contributor Author

@fmease would you be ok with me assigning this PR to you? (once I have re-reviewed it again)

@fmease

fmease commented Apr 14, 2026

Copy link
Copy Markdown
Member

Sure! :)

@fmease fmease self-assigned this Apr 14, 2026
@scrabsha scrabsha force-pushed the push-qlmmuuwqnoqv branch from 83f6ae9 to 0e53906 Compare April 15, 2026 21:07
scrabsha
scrabsha commented Apr 17, 2026
View reviewed changes
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
scrabsha
scrabsha commented Apr 17, 2026
View reviewed changes
Comment thread compiler/rustc_span/src/source_map.rs

@scrabsha scrabsha Apr 17, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The changes in the file are needed because the closure passed to span_extend_while in item.rs mutably borrows comma_reached.

View changes since the review

@scrabsha

scrabsha commented Apr 17, 2026

Copy link
Copy Markdown
Contributor Author

thank you!

r? fmease

@rustbot

rustbot commented Apr 17, 2026

Copy link
Copy Markdown
Collaborator

Requested reviewer is already assigned to this pull request.

Please choose another assignee.

@scrabsha scrabsha marked this pull request as ready for review April 17, 2026 15:53
@rustbot

rustbot commented Apr 17, 2026

Copy link
Copy Markdown
Collaborator

The parser was modified, potentially altering the grammar of (stable) Rust
which would be a breaking change.

cc @fmease

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 17, 2026
fmease
fmease reviewed May 22, 2026
View reviewed changes

@fmease fmease left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preliminary review, sorry for the delay.

View changes since this review

Comment thread compiler/rustc_parse/src/parser/attr.rs Outdated
Comment thread compiler/rustc_parse/src/parser/attr.rs Outdated
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
fmease
fmease reviewed May 22, 2026
View reviewed changes
Comment thread compiler/rustc_parse/src/parser/item.rs
fmease
fmease reviewed May 22, 2026
View reviewed changes

@fmease fmease left a comment •
edited by rustbot
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some more comments but this already looks very good overall, thanks for working on this!

View changes since this review

Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated
@fmease fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2026
@scrabsha

scrabsha commented May 23, 2026

Copy link
Copy Markdown
Contributor Author

hi @fmease, thank you infinitely for your review. you put a lot of care into these and i really really appreciate all your explanations <3

i'll fix everything once the all hands is over and i have some quiet time, but I still wanted to say thanks as soon as possible :)

thank you again!

@scrabsha scrabsha force-pushed the push-qlmmuuwqnoqv branch from 0e53906 to b8a59e1 Compare July 8, 2026 12:11
@rustbot

rustbot commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@scrabsha scrabsha force-pushed the push-qlmmuuwqnoqv branch from b8a59e1 to e73c92c Compare July 8, 2026 13:08
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@scrabsha scrabsha force-pushed the push-qlmmuuwqnoqv branch from e73c92c to 7c97022 Compare July 8, 2026 14:05
@scrabsha

scrabsha commented Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

@fmease sorry for the delay. i have addressed all the points you have raised in your review and rebased my work over main.

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 8, 2026
@rust-bors

rust-bors Bot commented Jul 12, 2026

Copy link
Copy Markdown
Contributor

☔ The latest upstream changes (presumably #159170) made this pull request unmergeable. Please resolve the merge conflicts by rebasing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fmease fmease fmease left review comments

At least 1 approving review is required to merge this pull request.

Assignees

@fmease fmease

Labels

S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@scrabsha @rust-log-analyzer @fmease @rustbot