Skip to content

Conversation

compiler-errors
Copy link
Member

I accidentally pushed the wrong commits because I totally didn't check I was on the right computer when updating #118026.
Sorry, this should address all the nits in #118026.

r? lcnr

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 21, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the deref-into-dyn-regions branch from a4baa03 to 781eb9e Compare November 21, 2023 20:48
@lcnr
Copy link
Contributor

lcnr commented Nov 22, 2023

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 22, 2023

📌 Commit 781eb9e has been approved by lcnr

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 Nov 22, 2023
@bors
Copy link
Collaborator

bors commented Nov 22, 2023

☔ The latest upstream changes (presumably #118133) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 22, 2023
@rust-cloud-vms rust-cloud-vms bot force-pushed the deref-into-dyn-regions branch from 781eb9e to aec39b6 Compare November 22, 2023 21:43
@rust-cloud-vms rust-cloud-vms bot force-pushed the deref-into-dyn-regions branch from aec39b6 to 15fbcc3 Compare November 22, 2023 21:52
@compiler-errors
Copy link
Member Author

Adapted the PR to some of the rewordings from the stabilization PR.

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Nov 22, 2023

📌 Commit 15fbcc3 has been approved by lcnr

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 22, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 23, 2023
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#118131 (improve tool-only help for multiple `#[default]` variants)
 - rust-lang#118146 (Rework supertrait lint once again)
 - rust-lang#118167 (make the 'abi_unadjusted' feature internal)
 - rust-lang#118169 (print query map for deadlock when using parallel front end)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit add423b into rust-lang:master Nov 23, 2023
@rustbot rustbot added this to the 1.76.0 milestone Nov 23, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 23, 2023
Rollup merge of rust-lang#118146 - compiler-errors:deref-into-dyn-regions, r=lcnr

Rework supertrait lint once again

I accidentally pushed the wrong commits because I totally didn't check I was on the right computer when updating rust-lang#118026.
Sorry, this should address all the nits in rust-lang#118026.

r? lcnr
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants