[beta-1.68] Backport fixes of split-debuginfo detection#11649
Merged
bors merged 5 commits intorust-lang:rust-1.68.0from Jan 30, 2023
Merged
[beta-1.68] Backport fixes of split-debuginfo detection#11649bors merged 5 commits intorust-lang:rust-1.68.0from
bors merged 5 commits intorust-lang:rust-1.68.0from
Conversation
…=weihanglo Fix split-debuginfo support detection ### What does this PR try to resolve? cargo assumed that if `-Csplit-debuginfo=packed` worked, all values would be correct. This however is not the case -- as of Rust 1.65.0, rustc supports `packed`, but not `unpacked` or `off` on Windows. Because of this, having `split-debuginfo="unpacked`" on Windows has caused builds to fail, as cargo assumed that the option is fine (`split-debuginfo=packed` worked), but rustc then failed when being passed `-Csplit-debuginfo=unpacked`. ### How should we test and review this PR? Consider an empty project with the following change to `Cargo.toml`: ```toml [profile.dev] split-debuginfo="unpacked" ``` `cargo +1.64.0 build` will work, but `cargo +1.65.0 build` will fail with the following error message: ``` PS C:\REDACTED> cargo build Compiling tmp v0.1.0 (C:\REDACTED) error: `-Csplit-debuginfo=unpacked` is unstable on this platform error: could not compile `tmp` due to previous error ``` With this patch and 1.65.0 rustc, cargo will ignore all `split-debuginfo` settings, but with rust-lang/rust#104104 rustc (approved, awaiting merge), it will properly detect supported values for `split-debuginfo` and only ignore those that are unsupported.
…=ehuss Reduce target info rustc query calls
Collaborator
|
r? @ehuss (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
the
S-waiting-on-review
test: Update for clap 4.1.3 The latest clap release fixed a bug with the algorithm for providing suggestions, leading this suggestion to change.
Temporarily pin libgit2-sys. There are some issues with the most recent libgit2-sys 0.14.2 not working on Windows (libgit2/libgit2#6453 and libgit2/libgit2#6454). Until we figure out what to do with it, this pins the release to the previous version.
… r=epage Disable network SSH tests on windows. These tests have a high failure rate on Windows, so this disables them for now. I don't know exactly why they are failing. If I had to take a wild guess, I would suspect the use of WinCNG for the SSH backend, which may mean it is out of our control.
Member
Author
|
Noticed that rustbot didn't warn us anymore for filing against a branch other than master.
|
Contributor
|
@bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
Contributor
|
@bors retry GitHub Actions has encountered an internal error when running your job. |
bors
added
S-waiting-on-bors
Member
Author
|
By the way, when we backport we are often required to backport unrelated PRs just to make CI happy, since we don't commit Cargo.lock. It may also make |
Contributor
Contributor
|
☀️ Test successful - checks-actions |
bors
pushed a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 1, 2023
1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c 2023-01-20 14:39:28 +0000 to 2023-01-30 22:07:51 +0000 - [beta-1.68] Backport fixes of split-debuginfo detection (rust-lang/cargo#11649)
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 1, 2023
[beta] Cargo 1.68.0 backports 1 commits in 985d561f0bb9b76ec043a2b12511790ec7a2b954..0762e3bbdb6fa64b6859154199ec47d6c90c731c 2023-01-20 14:39:28 +0000 to 2023-01-30 22:07:51 +0000 - [beta-1.68] Backport fixes of split-debuginfo detection (rust-lang/cargo#11649) r? `@ehuss`
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
4 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.
Beta backports:
In order to make CI pass, the following PR are also cherry-picked: