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

[beta] Update cargo (CVE fixes included) #101922

Closed
wants to merge 29 commits into from

Commits on Aug 8, 2022

  1. Configuration menu
    Copy the full SHA
    1d09f2c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0281ea4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e597688 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cbf9902 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    903561f View commit details
    Browse the repository at this point in the history
  6. Avoid ICE in rustdoc.

    cjgillot authored and Mark-Simulacrum committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    7c45c50 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f4fb94a View commit details
    Browse the repository at this point in the history
  8. Add regression test comment

    camelid authored and Mark-Simulacrum committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    275ad6b View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2022

  1. Auto merge of rust-lang#100274 - Mark-Simulacrum:beta-next, r=Mark-Si…

    …mulacrum
    
    [beta] 1.64.0 branching
    
    Includes cherry picks of:
    
    * rust-lang#100207
    * rust-lang/rust-clippy#9302
    * rust-lang/rust@49b1904 (explicit_auto_deref into nursery)
    *  Avoid ICE in rustdoc when using Fn bounds rust-lang#100205
    
    r? `@Mark-Simulacrum`
    bors committed Aug 9, 2022
    Configuration menu
    Copy the full SHA
    56714e5 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2022

  1. Configuration menu
    Copy the full SHA
    444156e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7a51fa4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    babe5a0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c8da3d4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    8ae6300 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2022

  1. Auto merge of rust-lang#100412 - Mark-Simulacrum:beta-next, r=Mark-Si…

    …mulacrum
    
    Rollup of beta backports
    
    This rolls up bumping stage0 to released stable and:
    
    * Iterate generics_def_id_map in reverse order to fix P-critical issue rust-lang#100340
    *  [BETA 1.64] Only override published resolver when the workspace is different rust-lang/cargo#10970
    
    r? `@Mark-Simulacrum`
    bors committed Aug 14, 2022
    Configuration menu
    Copy the full SHA
    fb2194a View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. Revert let_chains stabilization

    This reverts commit 3266460.
    
    It was discovered that they are not implemented correctly, which
    does not make them ready for stabilization.
    Noratrieb committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    11a367a View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. Auto merge of rust-lang#100538 - Nilstrieb:revert-let-chains-beta, r=…

    …compiler-errors
    
    Revert let_chains stabilization
    
    This reverts commit 3266460.
    
    It was discovered in rust-lang#100513 that they are not implemented correctly, which does not make them ready for stabilization.
    
    The merge in the let parsing had a few conflicts, cc `@compiler-errors` and `@c410-f3r` to make sure I did it correctly (alternatively I could also revert `@compiler-errors'` let diagnostic improvement PR as well if a simpler revert is desired).
    
    r? `@Mark-Simulacrum`
    bors committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    82bf341 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2022

  1. Configuration menu
    Copy the full SHA
    63bb951 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2741dd8 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. regression tests for problems that are exposed by mir-inlining policy…

    … that we are reverting for 1.64-beta.
    pnkfelix committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    2f96703 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2022

  1. [beta] Update cargo

    ehuss committed Aug 30, 2022
    Configuration menu
    Copy the full SHA
    3b1c95d View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Auto merge of rust-lang#99893 - compiler-errors:issue-99387, r=davidtwco

    Delay formatting trimmed path until lint/error is emitted
    
    Fixes rust-lang#99387
    
    r? `@davidtwco`
    bors authored and ehuss committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    b4b39cd View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#100155 - compiler-errors:issue-100154, r=ja…

    …ckh726
    
    Use `node_type_opt` to skip over generics that were not expected
    
    Fixes rust-lang#100154
    Dylan-DPC authored and ehuss committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    116e19f View commit details
    Browse the repository at this point in the history
  3. Auto merge of rust-lang#99860 - oli-obk:revert_97346, r=pnkfelix

    Revert "Rollup merge of rust-lang#97346 - JohnTitor:remove-back-compat-hacks, …
    
    …r=oli-obk"
    
    This reverts commit c703d11, reversing
    changes made to 64eb9ab.
    
    it didn't apply cleanly, so now it works the same for RPIT and for TAIT instead of just working for RPIT, but we should keep those in sync anyway. It also exposed a TAIT bug (see the feature gated test that now ICEs).
    
    r? `@pnkfelix`
    
    fixes rust-lang#99536
    bors authored and ehuss committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    cff90fe View commit details
    Browse the repository at this point in the history
  4. Auto merge of rust-lang#101221 - ehuss:update-beta-cargo, r=ehuss

    [BETA] Beta 1.64 backports
    
    * Cargo:
        * remove missed reference to workspace inheritance in unstable.md (rust-lang/cargo#11002)
    * Delay formatting trimmed path until lint/error is emitted rust-lang#99893
    * Use `node_type_opt` to skip over generics that were not expected rust-lang#100155
    * Revert "Remove a back-compat hack on lazy TAIT rust-lang#97346" rust-lang#99860
    bors committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    4497ac9 View commit details
    Browse the repository at this point in the history
  5. Auto merge of rust-lang#101050 - pnkfelix:revert-mir-inline-policy-fo…

    …r-beta-1.64, r=compiler-errors
    
    revert mir inlining policy for beta-1.64
    
    revert mir inlining policy for beta-1.64
    
    Fix rust-lang#101004
    bors committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    1ec9b66 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2022

  1. Configuration menu
    Copy the full SHA
    c7f8e68 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2022

  1. Auto merge of rust-lang#101320 - RalfJung:beta-ctfe-ptr-provenance, r…

    …=pnkfelix
    
    beta-backport of provenance-related CTFE changes
    
    This is all part of dealing with rust-lang#99923.
    
    The first commit backports the effects of rust-lang#101101. `@pnkfelix` asked for this and it turned out to be easy, so I think this is uncontroversial.
    
    The second commit effectively repeats rust-lang#99965, which un-does the effects of rust-lang#97684 and therefore means rust-lang#99923 does not apply to the beta branch. I honestly don't think we should do this; the sentiment in rust-lang#99923 was that we should go ahead with the change but improve diagnostics. But `@pnkfelix` seemed to request such a change so I figured I would offer the option.
    
    I'll be on vacation soon, so if you all decide to take the first commit only, then someone please just force-push to this branch and remove the 2nd commit.
    bors committed Sep 9, 2022
    Configuration menu
    Copy the full SHA
    25912c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2022

  1. [beta] Update cargo

    3 commits in 4bcb3c65e440a12044092b85ffea8fac6cb96f42..387270bc7f446d17869c7f208207c73231d6a252
    2022-08-17 21:01:34 +0000 to 2022-09-16 20:18:27 +0000
    
    - Beta backport rust-lang/cargo#11082 (rust-lang/cargo#11097)
    - [Beta] Run `reach_max_unpack_size` test only on debug build (rust-lang/cargo#11090)
    - [beta] Fix for CVE-2022-36113 and CVE-2022-36114 (rust-lang/cargo#11088)
    weihanglo committed Sep 16, 2022
    Configuration menu
    Copy the full SHA
    3bb1c52 View commit details
    Browse the repository at this point in the history