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.

Sign up for GitHub

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

Jump to bottom

[beta] backports #89854

Merged
merged 23 commits into from
Oct 15, 2021
Merged

[beta] backports #89854

merged 23 commits into from
Oct 15, 2021

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Oct 13, 2021 •
edited by Mark-Simulacrum
Loading

roxelo and others added 15 commits October 13, 2021 10:54
@roxelo @cuviper
2229: Consume IfLet expr
428285e 
(cherry picked from commit 8701020)
@roxelo @cuviper
Fix test
16254e9 
(cherry picked from commit d0e2b60)
@hkratz @cuviper
Add wrapper for -Z gcc-ld=lld to invoke rust-lld with the correct flavor
6e09975 
The wrapper is installed as `ld` and `ld64` in the `lib\rustlib\<host_target>\bin\gcc-ld`
directory and its sole purpose is to invoke `rust-lld` in the parent directory with
the correct flavor.

(cherry picked from commit 6162fc0)
@cuviper
Downgrade lld-wrapper to 2018 edition
38d4091
@FabianWolff @cuviper
Fix unsound optimization with explicit variant discriminants
e15cb6f 
(cherry picked from commit 529c353)
@FabianWolff @cuviper
Update comments
7dff1cd 
(cherry picked from commit 20489ea)
@FabianWolff @cuviper
Disable SimplifyBranchSame optimization for now
ff54f71 
(cherry picked from commit dd9b476)
@camelid @cuviper
Fix stabilization version for bindings_after_at
7b7bdc0 
According to the release notes and its PR milestone, it was stabilized
in 1.56.0.

(cherry picked from commit 6189d0a)
@michaelwoerister @cuviper
Remove untracked vtable-const-allocation cache from tcx
cb8ea8c 
(cherry picked from commit a1e2c0f)
@michaelwoerister @cuviper
Turn tcx.vtable_allocation() into a query.
79afdb0 
(cherry picked from commit b7cc991)
@yaahc @cuviper
Revert "Stabilize Iterator::intersperse()"
6689493 
(cherry picked from commit 8965b58)
@nbdd0121 @cuviper
Ignore projection type when determining upvar ancestory
ce633b2 
(cherry picked from commit 5481201)
@nbdd0121 @cuviper
Add regression test
0ee5315 
(cherry picked from commit d7f8a06)
@nbdd0121 @cuviper
Explicit PlaceAncestryRelation::SamePlace and handle like Descendant
e2f363c 
(cherry picked from commit 7275cfa)
@ibraheemdev @cuviper
revert stabilization of core::task::ready!
4a9b892 
(cherry picked from commit 5f7e7d2)
@rust-highfive
Copy link
Collaborator

Some changes occured to rustc_codegen_cranelift

cc @bjorn3

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@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!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2021
@cuviper
Copy link
Member Author

cuviper commented Oct 13, 2021

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Oct 13, 2021

📌 Commit 4a9b892 has been approved by cuviper

@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 Oct 13, 2021
@nbdd0121
Copy link
Contributor

Not sure where's the best place to raise it, but I think #89585 should be backported as well (P-high stable-to-stable regression). It has been beta-nominated but didn't get a discussion/decision.

@cuviper
Copy link
Member Author

cuviper commented Oct 13, 2021

@nbdd0121 I expect that will be discussed in tomorrow's compiler meeting.
I didn't make any judgements here, just took the changes that were already beta-accepted.

@hkratz
Copy link
Contributor

hkratz commented Oct 13, 2021

I think, the libisl download fixes (at least #89599, possibly #89661) need to be backported as well, otherwise some of the dist builds will fail.

@bors
Copy link
Contributor

bors commented Oct 13, 2021

⌛ Testing commit 4a9b892 with merge 32687928610853e24de4177221e610bd0a6842a0...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Oct 14, 2021

📌 Commit 8d944eb has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 14, 2021
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Oct 14, 2021
Merged
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Oct 14, 2021

📌 Commit 673a223 has been approved by Mark-Simulacrum

@apiraino apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 14, 2021
@bors
Copy link
Contributor

bors commented Oct 14, 2021

⌛ Testing commit 673a223 with merge 6ce48e1a94f38d218466ca4d6075690719d18dbd...

@bors
Copy link
Contributor

bors commented Oct 14, 2021

💥 Test timed out

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2021
@cuviper
Copy link
Member Author

cuviper commented Oct 14, 2021

@bors retry

dist-aarch64-apple timed out.

@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 Oct 14, 2021
@bors
Copy link
Contributor

bors commented Oct 14, 2021

⌛ Testing commit 673a223 with merge 58268ff...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Oct 15, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 58268ff to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 15, 2021
@bors bors merged commit 58268ff into rust-lang:beta Oct 15, 2021
@rustbot rustbot added this to the 1.56.0 milestone Oct 15, 2021
@cuviper cuviper deleted the beta-next branch October 15, 2021 02:37
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Oct 15, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

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
Milestone
1.56.0
Development

Successfully merging this pull request may close these issues.