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] Beta 1.64 backports #101221

Merged
merged 4 commits into from
Aug 31, 2022
Merged

[BETA] Beta 1.64 backports #101221

merged 4 commits into from
Aug 31, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Aug 31, 2022

ehuss and others added 4 commits August 30, 2022 16:51
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
@ehuss ehuss self-assigned this Aug 31, 2022
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Aug 31, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2022
@ehuss
Copy link
Contributor Author

ehuss commented Aug 31, 2022

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Aug 31, 2022

📌 Commit cff90fe has been approved by ehuss

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2022
@bors
Copy link
Contributor

bors commented Aug 31, 2022

⌛ Testing commit cff90fe with merge 4497ac9...

@bors
Copy link
Contributor

bors commented Aug 31, 2022

☀️ Test successful - checks-actions
Approved by: ehuss
Pushing 4497ac9 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2022
@bors bors merged commit 4497ac9 into rust-lang:beta Aug 31, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants