Skip to content

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Oct 4, 2022

pulled out of #101900 which adds a fourth kind of non-lifetime generic parameter, and the naming of these methods would get ridiculous.

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 4, 2022
@rustbot
Copy link
Collaborator

rustbot commented Oct 4, 2022

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in const_evaluatable.rs

cc @lcnr

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-highfive
Copy link
Contributor

r? @fee1-dead

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 4, 2022
@lcnr
Copy link
Contributor

lcnr commented Oct 4, 2022

r? @lcnr

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 4, 2022

📌 Commit d8883422555aa8d73971791dea6cbc8bd0d3be4e has been approved by lcnr

It is now in the queue for this repository.

@rust-highfive rust-highfive assigned lcnr and unassigned fee1-dead Oct 4, 2022
@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 4, 2022
@bors
Copy link
Collaborator

bors commented Oct 4, 2022

☔ The latest upstream changes (presumably #102622) 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 Oct 4, 2022
@oli-obk oli-obk force-pushed the non_region_things branch from d888342 to c7b6ebd Compare October 4, 2022 14:11
@oli-obk
Copy link
Contributor Author

oli-obk commented Oct 4, 2022

@bors r=lcnr

@bors
Copy link
Collaborator

bors commented Oct 4, 2022

📌 Commit c7b6ebd 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 Oct 4, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2022
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#102241 (Package `rust-docs-json` into nightly components (take 3))
 - rust-lang#102488 (Check generic argument compatibility when projecting assoc ty)
 - rust-lang#102647 (Only allow ~const bounds for traits with #[const_trait])
 - rust-lang#102648 (Add test for rust-lang#102605)
 - rust-lang#102651 (It's not about types or consts, but the lack of regions)
 - rust-lang#102653 (resolve instance: missing value to `delay_span_bug`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0dd0c6c into rust-lang:master Oct 4, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 4, 2022
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.

6 participants