expand: Refactor InvocationCollector visitor for better code reuse #92573
Conversation
This file contains 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
rustbot
added
the
T-compiler
rust-highfive
added
the
S-waiting-on-review
petrochenkov
commented
Jan 5, 2022
| } | ||
| fn take_mac_call(self) -> (ast::MacCall, Self::AttrsTy, bool) { | ||
| unreachable!() | ||
| } |
There was a problem hiding this comment.
Initially I tried the fn take_mac_call(self) -> Result<...> approach, but it ended up being less convenient than two separate functions due to consuming self too early (we don't want self to be consumed if there's no macro call).
| .field("tag", &self.tag) | ||
| .finish() | ||
| } | ||
| } |
There was a problem hiding this comment.
Deriving this impl puts the Debug requirement on tag types, unfortunately.
This was referenced Jan 5, 2022
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jan 5, 2022
ast: Always keep a `NodeId` in `ast::Crate` This makes it more uniform with other expanded nodes. It makes generic code in rust-lang#92573 simpler in particular. This is another follow-up to rust-lang#91313. r? `@Aaron1011`
Aaron1011
reviewed
Jan 5, 2022
Aaron1011
reviewed
Jan 5, 2022
Aaron1011
reviewed
Jan 5, 2022
petrochenkov
added
S-waiting-on-author
|
Updated. |
petrochenkov
added
S-waiting-on-review
Aaron1011
reviewed
Jan 6, 2022
petrochenkov
added
S-waiting-on-author
petrochenkov
added
S-waiting-on-review
|
r=me with the commits squashed |
|
Other commits are separate small refactorings that are weakly related to the main commit "Refactor InvocationCollector visitor", they also touch some code other than invocation collector, so I think it's reasonable to keep them separate. |
|
📌 Commit 4523466 has been approved by |
bors
removed
the
S-waiting-on-review
bors
added
the
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 9, 2022
…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#92055 (Add release notes for 1.58) - rust-lang#92490 (Move crate drop-down to search results page) - rust-lang#92510 (Don't resolve blocks in foreign functions) - rust-lang#92573 (expand: Refactor InvocationCollector visitor for better code reuse) - rust-lang#92608 (rustdoc: Introduce a resolver cache for sharing data between early doc link resolution and later passes) - rust-lang#92657 (Implemented const casts of raw pointers) - rust-lang#92671 (Make `Atomic*::from_mut` return `&mut Atomic*`) - rust-lang#92673 (Remove useless collapse toggle on "all items" page) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
The refactoring part of #92473.
Invocation collector visitor logic now lives in two main functions:
fn flat_map_node, corresponding to "one to many" expansionsfn visit_node, corresponding to "one to one" expansionsAll specific mut visitor methods now use one of these functions.
The new
InvocationCollectorNodetrait implemented for allAstFragmentnodes provides the necessary small pieces of functionality required to implement the(flat_map,visit)_nodefunctions.r? @Aaron1011