fix(vendor): Strip excluded build targets #14367
Merged
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
Since we already cover this for `cargo package` and we turn all implicit targets into explicit targets (making implicit tests cover explicit cases), this becomes redundant.
This is a **very** hacky solution, duplicating the minimum of what `prepare_for_publish` does to fix this one issue and in the least intrusive way to the vendor code. The intention is to keep this low risk for backporting to beta and stable. We need to revisit this, refactoring the `cargo package` code so that we can call into that for each vendored dependency. Fixes rust-lang#14348
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
rustbot
added
A-manifest
weihanglo
approved these changes
Aug 7, 2024
|
@bors r=weihanglo |
bors
added
S-waiting-on-bors
epage
added
S-waiting-on-review
|
I can do the beta backport. |
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 8, 2024
Update cargo 3 commits in 94977cb1fab003d45eb5bb108cb5e2fa0149672a..0d8d22f83b066503f6b2b755925197e959e58b4f 2024-08-06 21:42:10 +0000 to 2024-08-08 12:54:24 +0000 - fix: std Cargo.lock moved to `library` dir (rust-lang/cargo#14370) - fix(vendor): Strip excluded build targets (rust-lang/cargo#14367) - Infer registry (rust-lang/cargo#14340) r? ghost
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.
What does this PR try to resolve?
Fixes #14348
How should we test and review this PR?
The commits are setup to be able to show, through the tests, how the
cargo packageandcargo vendorbehavior diverge and then howcargo vendors behavior changes over time.This is a very hacky solution, duplicating the minimum of what
prepare_for_publishdoes to fix this one issue and in the leastintrusive way to the vendor code.
The intention is to keep this low risk for backporting to beta and
stable.
We need to revisit this, refactoring the
cargo packagecode so that wecan call into that for each vendored dependency.
Additional information