[beta-1.81] fix(vendor): Strip excluded build targets #14368
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
Between rust-lang/rust#126810 and rust-lang/rust#126810 the output of rustc for resolution errors is going to change in such a way that some existing cargo tests will fail. Change them to support both the current and future output, so that those PRs can land in `rustc`.
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
|
rustbot
added
A-manifest
weihanglo
approved these changes
Aug 7, 2024
|
Thanks. @bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced Aug 9, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 21, 2024
…nglo [beta-1.81] Update cargo 3 commits in ca2346bd3c7f51e82964aaf7e47cdf770047b6ab..2dbb1af80a2914475ba76827a312e29cedfa6b2f 2024-07-31 19:33:19 +0000 to 2024-08-20 18:24:58 +0000 - [beta-1.81] chore(deps): update rust crate gix to 0.64.0 (rust-lang/cargo#14431) - [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" (rust-lang/cargo#14366) - [beta-1.81] fix(vendor): Strip excluded build targets (rust-lang/cargo#14368) 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.
Beta backports
In order to make CI pass, the following PRs are also cherry-picked:
build_std::basictest (see also [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" #14366)rustcwording changes #14341, see also [beta-1.81] Revert "fix: Ensure dep/feature activates the dependency on 2024" #14366)