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

Rollup of 1 pull requests #101945

Closed
wants to merge 40 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Mark-Simulacrum and others added 30 commits August 8, 2022 08:32
…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`
…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`
This reverts commit 3266460.

It was discovered that they are not implemented correctly, which
does not make them ready for stabilization.
…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`
The "Internal Changes" section currently says "no direct user facing
benefits", but includes "significant improvements to the ... overall
performance", which is a user-facing benefit. Reword it to say "do not
affect any public interfaces" instead.
Delay formatting trimmed path until lint/error is emitted

Fixes rust-lang#99387

r? `@davidtwco`
…ckh726

Use `node_type_opt` to skip over generics that were not expected

Fixes rust-lang#100154
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
[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 and others added 10 commits August 31, 2022 15:25
…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
…=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.
…ulacrum

[Beta] Clippy: Fix hang in `vec_init_then_push`

Small Clippy ICE/hang fix backport before beta gets branched. We'd like to get this into stable ASAP. This fix is already in `master` as 1585932.
…-Simulacrum

Initial version of 1.64 release notes

Needs further expansion on some points, with text that will likely end up in
the blog post as well.

Also adds the release notes from 1.62.1 and 1.63, which weren't present on the
branch.
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 17, 2022
@matthiaskrgr
Copy link
Member Author

first PR was actually against beta branch but marked as rollup=always whelp

@davidtwco davidtwco removed the A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic label Oct 4, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-uizd2bx branch October 9, 2022 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.