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

Update rustc_version_cmd #3903

Merged
merged 1 commit into from
Sep 6, 2024
Merged

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Sep 6, 2024

Change if let to a match because it is about equal complexity. This should allow backporting 1 easier.

Additionally, add some new documentation comments.

@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 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 6, 2024
This 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:

- <rust-lang#3893>
- <rust-lang#3903>

Handle rustc version output correctly when `clippy-driver` used

Update `rustc_version_cmd`

Change `if let` to a `match` because it is about equal complexity. This
should allow backporting [1] easier.

Additionally, add some new documentation comments.

[1]: rust-lang#3893
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
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Sep 6, 2024
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
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Sep 6, 2024
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>
@tgross35 tgross35 added this pull request to the merge queue Sep 6, 2024
Merged via the queue into rust-lang:main with commit 1b11393 Sep 6, 2024
40 of 41 checks passed
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Sep 10, 2024
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>
@tgross35 tgross35 added the stable-applied This PR has been cherry-picked to libc's stable release branch label Sep 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants