Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[0.2] Fix rustc version when clippy-driver is used #3904

Merged
merged 2 commits into from
Sep 10, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Sep 6, 2024

The first commit is a combined cherry-pick of the following two commits:

  • 18b8da9 ("Handle rustc version output correctly...")
  • d61f6f6 ("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:

@rustbot
Copy link
Collaborator

rustbot commented Sep 6, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@tgross35 tgross35 force-pushed the backport-buildrs-fix branch 2 times, most recently from 6196c7f to 1074417 Compare September 6, 2024 11:35
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 <me@nathanielbennett.com>
Co-authored-by: Trevor Gross <tmgross@umich.edu>
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 tgross35 added this pull request to the merge queue Sep 10, 2024
Merged via the queue into rust-lang:libc-0.2 with commit a515d07 Sep 10, 2024
52 of 53 checks passed
@tgross35 tgross35 deleted the backport-buildrs-fix branch September 10, 2024 18:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants