Refactor generate_targets into separate module#11445
Merged
bors merged 3 commits intorust-lang:masterfrom Dec 2, 2022
Merged
Conversation
rustbot
added
the
S-waiting-on-review
…d into new TargetGenerator struct
willcrichton
force-pushed
the
refactor-target-generator
branch
from
5cc7fba to
cb97d06
Compare
weihanglo
reviewed
Dec 1, 2022
Member
weihanglo
left a comment
weihanglo
left a comment
There was a problem hiding this comment.
Do you feel it better to name it UnitGenerator in order to avoid the term target being overloaded too much? (And relevant method name as well)
I am not sure, though 😅.
Contributor
Author
|
Yeah I agree that unit is the better term to use here. I just renamed all the appropriate functions and data structures. |
weihanglo
reviewed
Dec 2, 2022
Member
weihanglo
left a comment
weihanglo
left a comment
There was a problem hiding this comment.
Looks pretty good to me. I'd like to merge it. If anyone doesn't like this kind of change, please stop me.
…res to cargo_compile top-level module
Contributor
Author
|
@weihanglo just fixed both your comments. |
weihanglo
approved these changes
Dec 2, 2022
Member
|
@bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
This was referenced Dec 2, 2022
weihanglo
added a commit
to weihanglo/rust
that referenced
this pull request
Dec 3, 2022
9 commits in e027c4b5d25af2119b1956fac42863b9b3242744..f6e737b1e3386adb89333bf06a01f68a91ac5306 2022-11-25 19:44:46 +0000 to 2022-12-02 20:21:24 +0000 - Refactor generate_targets into separate module (rust-lang/cargo#11445) - Improve file found in multiple build targets warning (rust-lang/cargo#11299) - Error when precise without -p flag (rust-lang/cargo#11349) - Improve strategy for selecting targets to be scraped for examples (rust-lang/cargo#11430) - Aware of compression ratio for unpack size limit (rust-lang/cargo#11337) - Add test for rustdoc-map generation when using sparse registries (rust-lang/cargo#11403) - Add error message when `cargo fix` on an empty repo (rust-lang/cargo#11400) - Store the sparse+ prefix in the SourceId for sparse registries (rust-lang/cargo#11387) - Update documentation for -Zrustdoc-scrape-examples in the Cargo Book (rust-lang/cargo#11425)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 3, 2022
Update cargo 9 commits in e027c4b5d25af2119b1956fac42863b9b3242744..f6e737b1e3386adb89333bf06a01f68a91ac5306 2022-11-25 19:44:46 +0000 to 2022-12-02 20:21:24 +0000 - Refactor generate_targets into separate module (rust-lang/cargo#11445) - Improve file found in multiple build targets warning (rust-lang/cargo#11299) - Error when precise without -p flag (rust-lang/cargo#11349) - Improve strategy for selecting targets to be scraped for examples (rust-lang/cargo#11430) - Aware of compression ratio for unpack size limit (rust-lang/cargo#11337) - Add test for rustdoc-map generation when using sparse registries (rust-lang/cargo#11403) - Add error message when `cargo fix` on an empty repo (rust-lang/cargo#11400) - Store the sparse+ prefix in the SourceId for sparse registries (rust-lang/cargo#11387) - Update documentation for -Zrustdoc-scrape-examples in the Cargo Book (rust-lang/cargo#11425)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
What does this PR try to resolve?
The
generate_targetsfunction is fairly complicated with an absurd number of parameters. This PR refactors the function into aTargetGeneratorstruct that represents the state of the generator, and reduces the amount of parameter-passing between the relevant functions. Additionally, thegenerate_targetsfunction has been refactored into two smaller functionscreate_proposalsandproposals_to_units. The docscrape-specific functionality from #11430 has been pulled out into a separate function, as promised.How should we test and review this PR?
This PR does not change any functionality, so no new tests are added. It should be reviewed for code style.
r? @weihanglo