Skip to content

Recover on attribute in use tree - #155254

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

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

Conversation

@scrabsha

@scrabsha scrabsha commented Apr 13, 2026

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.

@scrabsha
scrabsha force-pushed the push-qlmmuuwqnoqv branch from 291ff75 to 290c04c Compare April 13, 2026 19:54
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

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
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated

@scrabsha scrabsha Apr 17, 2026

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

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 left a comment

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
Comment thread compiler/rustc_parse/src/parser/item.rs Outdated

@fmease fmease left a comment

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

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

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@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.

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

@fmease fmease left a comment

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.

Thanks for applying my feedback and apologies for the long wait, I couldn't be as active in the project in July+August.

I've rebased the PR as the reviewer since it appears that so far the author hasn't been active on GH this month. I've also added an extra commit fixing super tiny nits.

@bors r+ rollup

View changes since this review

@rust-bors

rust-bors Bot commented Aug 23, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 1333ad7 has been approved by fmease

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member

Bors is refusing to roll this up, so let me give it a kick

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Aug 23, 2026
@rust-bors

rust-bors Bot commented Aug 23, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 23, 2026
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 23, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member

@bors r=fmease

@rust-bors

rust-bors Bot commented Aug 23, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 1333ad7 has been approved by fmease

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 23, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 23, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 23, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 23, 2026
…uwer

Rollup of 9 pull requests

Successful merges:

 - #160302 (target_features: sse (or at least avx2) is incompatible with soft-float ABI)
 - #161586 (miri subtree update)
 - #155254 (Recover on attribute in use tree)
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161294 (add crashtests [6/N])
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161588 (update eyre)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 23, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 23, 2026
…uwer

Rollup of 14 pull requests

Successful merges:

 - #160302 (target_features: sse (or at least avx2) is incompatible with soft-float ABI)
 - #161187 (add `Complex<T>` layout tests for straightforward targets)
 - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`)
 - #161586 (miri subtree update)
 - #155254 (Recover on attribute in use tree)
 - #158695 (Replace `CrateDump` with the Debug impl from `CStore`)
 - #160452 (-Ctarget-feature is not unsafe (any more))
 - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios")
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161588 (update eyre)
 - #161589 (std: reduce visibility of some internal OsStr related types)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
rust-bors Bot pushed a commit that referenced this pull request Aug 23, 2026
…uwer

Rollup of 14 pull requests

Successful merges:

 - #160302 (target_features: sse (or at least avx2) is incompatible with soft-float ABI)
 - #161187 (add `Complex<T>` layout tests for straightforward targets)
 - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`)
 - #161586 (miri subtree update)
 - #155254 (Recover on attribute in use tree)
 - #158695 (Replace `CrateDump` with the Debug impl from `CStore`)
 - #160452 (-Ctarget-feature is not unsafe (any more))
 - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios")
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161588 (update eyre)
 - #161589 (std: reduce visibility of some internal OsStr related types)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 23, 2026
rust-bors Bot pushed a commit that referenced this pull request Aug 23, 2026
…uwer

Rollup of 17 pull requests

Successful merges:

 - #161187 (add `Complex<T>` layout tests for straightforward targets)
 - #161524 (Put back `tests/rustdoc-gui/search-result-display.goml`)
 - #161592 (core: refactor tests/pattern.rs tests)
 - #161602 (Fix flakyness issue for `tests/rustdoc-gui/headers-color.goml`)
 - #155254 (Recover on attribute in use tree)
 - #158695 (Replace `CrateDump` with the Debug impl from `CStore`)
 - #159456 (Fix the reporting of layout normalization failures in transmute checks)
 - #160452 (-Ctarget-feature is not unsafe (any more))
 - #161007 (tests/ui/union/union-nodrop.rs: fix typo "expressios")
 - #161166 (add crashtests [5/N], remove unused aux files )
 - #161569 (Bump cfg_aliases to 0.2.2)
 - #161573 (re-bless `pretty-std` on windows)
 - #161588 (update eyre)
 - #161589 (std: reduce visibility of some internal OsStr related types)
 - #161598 ([Bootstrap] Pass exact CI `llvm-config` executable path)
 - #161601 (Path: use optimized is_empty() method)
 - #161604 (coretests: Add a few tests for backward multibyte predicate)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants