Skip to content

[beta] backports#102676

Merged
bors merged 34 commits intorust-lang:betafrom
cuviper:beta-next
Oct 10, 2022
Merged

[beta] backports#102676
bors merged 34 commits intorust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented Oct 4, 2022 •
edited
Loading

dingxiangfei2009 and others added 20 commits October 4, 2022 12:50
@dingxiangfei2009 @cuviper
avoid duplicating StorageLive in let-else
23e34ab 
(cherry picked from commit 48c1c1d)
@dingxiangfei2009 @cuviper
add mir-opt test
3f2c7e4 
(cherry picked from commit d510ba3)
@dingxiangfei2009 @cuviper
add miri test via const fn
4e55812 
(cherry picked from commit eb36f5e)
@jackh726 @cuviper
Make QueryOutlivesConstraint contain a ConstraintCategory
bafca23 
(cherry picked from commit a46376e)
@jackh726 @cuviper
Pass ConstraintCategory thorough a few more places
d1cbeba 
(cherry picked from commit 6075877)
@jackh726 @cuviper
Add to_constraint_category to ObligationCause and SubregionOrigin
e0bcd8f 
(cherry picked from commit 6765329)
@jackh726 @cuviper
Add outlives_constraint to BlameConstraint
8ecf3e7 
(cherry picked from commit ec17be2)
@jackh726 @cuviper
Add AscribeUserTypeProvePredicate
f174f66 
(cherry picked from commit 9929c0a)
@jackh726 @cuviper
Add ExtraConstraintInfo
4854513 
(cherry picked from commit f1767db)
@jackh726 @cuviper
Final bits
8a8c370 
(cherry picked from commit e09242d)
@jackh726 @cuviper
Add back in normalize call
923b120 
(cherry picked from commit 1eb71f0)
@jackh726 @cuviper
Use Predicate ConstraintCategory when normalizing
cf1c279 
(cherry picked from commit e7ca6e1)
@Mark-Simulacrum @cuviper
Revert "fix rust-lang#101691: copy stage0 binaries into stage0-sysroot"
6504453 
This reverts commit 32f8eb2.

(cherry picked from commit f0c78ee)
@lcnr @cuviper
improve infer var handling for implied bounds
274d802 
(cherry picked from commit 71f8fd5)
@lcnr @cuviper
add test
3ed6af5 
(cherry picked from commit 72a2102)
@RalfJung @cuviper
fix ConstProp handling of written_only_inside_own_block_locals
b117215 
(cherry picked from commit 7373788)
@oli-obk @cuviper
Fix wrongly refactored Lift impl
795a6da 
(cherry picked from commit 3e6c9e5)
@steffahn @cuviper
Fix a typo in error message
50a8433 
(cherry picked from commit 696472a)
@steffahn @cuviper
Bless test output changes
658aa16 
(cherry picked from commit 0776778)
@compiler-errors @cuviper
Deny associated type bindings within associated type bindings
df1e931 
(cherry picked from commit ca2e0bb)
@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. labels Oct 4, 2022
@rust-highfive
Copy link
Contributor

rust-highfive commented Oct 4, 2022

⚠️ 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!

@rustbot
Copy link
Collaborator

rustbot commented Oct 4, 2022

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @estebank, @TaKO8Ki

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2022
compiler-errors and others added 4 commits October 6, 2022 10:07
@compiler-errors @cuviper
Format type_of
14ff4cc 
(cherry picked from commit cca4828)
@compiler-errors @cuviper
Make type_of work correctly for const arg bindings
99a8cc1 
(cherry picked from commit 05267b5)
@compiler-errors @cuviper
Support bindings with anon consts in generics
328b53f 
(cherry picked from commit 92561f4)
@cjgillot @cuviper
Revert "Auto merge of rust-lang#101620 - cjgillot:compute_lint_levels…
d223452 
…_by_def, r=oli-obk"

This reverts commit 2cb9a65, reversing
changes made to 750bd1a.

(cherry picked from commit fc43df0)
@cuviper cuviper assigned cuviper and unassigned Mark-Simulacrum Oct 6, 2022
@rustbot rustbot added the A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) label Oct 6, 2022
@cuviper
Copy link
Member Author

cuviper commented Oct 6, 2022

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Oct 6, 2022

📌 Commit d223452 has been approved by cuviper

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 Oct 6, 2022
@bors
Copy link
Collaborator

bors commented Oct 7, 2022

⌛ Testing commit d223452 with merge c8450d4b1368158c1bb6000896167070aa7d2a02...

@bors
Copy link
Collaborator

bors commented Oct 7, 2022

💔 Test failed - checks-actions

@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 7, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cuviper
Copy link
Member Author

cuviper commented Oct 7, 2022

warning: spurious network error from crates.io...

@bors retry

@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 7, 2022
@cuviper
Copy link
Member Author

cuviper commented Oct 9, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Oct 9, 2022

📌 Commit f73da69 has been approved by cuviper

It is now in the queue for this repository.

@cuviper
Copy link
Member Author

cuviper commented Oct 9, 2022

The queue is getting longer -- bumping this up so we can maximize beta-testing time with these backports included.

@bors p=1

@bors
Copy link
Collaborator

bors commented Oct 10, 2022

⌛ Testing commit f73da69 with merge da7ffa2...

@bors
Copy link
Collaborator

bors commented Oct 10, 2022

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing da7ffa2 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 10, 2022
@bors bors merged commit da7ffa2 into rust-lang:beta Oct 10, 2022
@rustbot rustbot added this to the 1.65.0 milestone Oct 10, 2022
@cuviper cuviper deleted the beta-next branch October 15, 2022 00:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@dingxiangfei2009 dingxiangfei2009 dingxiangfei2009 left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@cuviper cuviper

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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-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.

Projects

None yet

Milestone

1.65.0

Development

Successfully merging this pull request may close these issues.