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

Commits on Sep 10, 2024

  1. Fix rustc version when clippy-driver is used

    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 and nathaniel-bennett committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    5078335 View commit details
    Browse the repository at this point in the history
  2. Simplify the RUSTC_WRAPPER check

    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 committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    abcb8f8 View commit details
    Browse the repository at this point in the history