[0.2] Fix rustc version when clippy-driver is used
#3904
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
|
r? @JohnTitor rustbot has assigned @JohnTitor. Use |
tgross35
force-pushed
the
backport-buildrs-fix
branch
2 times, most recently
from
6196c7f to
1074417
Compare
This is a combined cherry-pick of the following two commits: - 18b8da9 ("Handle rustc version output correctly...") - cdf12d2 ("Update `rustc_version_cmd`") These two commits are squashed for the backport to slightly reduce the amount of conflict resolution needed going forward (some small tweaks were still needed). This backports the following: - <rust-lang#3893> - <rust-lang#3903> Commit 1 original message: Handle rustc version output correctly when `clippy-driver` used Commit 2 original message: Update `rustc_version_cmd` Change `if let` to a `match` because it is about the same complexity but also works with our MSRV for 0.2. This should allow backporting [1] easier, as well as future backports that touch this code. Additionally, add some new documentation comments. [1]: rust-lang#3893 Co-authored-by: Nathaniel Bennett <[email protected]> Co-authored-by: Trevor Gross <[email protected]>
tgross35
force-pushed
the
backport-buildrs-fix
branch
from
1074417 to
4168789
Compare
This should be compatible with older versions of rustc, to get the branches more in sync. (backport <rust-lang#3910>) (cherry picked from commit bdce2b2)
tgross35
force-pushed
the
backport-buildrs-fix
branch
from
4168789 to
abcb8f8
Compare
Merged
via the queue into
rust-lang:libc-0.2
with commit Sep 10, 2024
a515d07
52 of 53 checks passed
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 first commit is a combined cherry-pick of the following two commits:
rustc_version_cmd")These two commits are squashed for the backport to slightly reduce the amount of conflict resolution needed going forward (some small tweaks were still needed).
This backports the following:
clippy-driverused #3893rustc_version_cmd#3903