Skip to content

Add candidates for DiscriminantKind builtin - #107427

Merged
bors merged 3 commits into
rust-lang:masterfrom
detrumi:builtin-impl-candidates
Feb 3, 2023
Merged

bors merged 3 commits into
rust-lang:masterfrom
detrumi:builtin-impl-candidates

Conversation

@detrumi

@detrumi detrumi commented Jan 28, 2023

Copy link
Copy Markdown
Contributor

Part of #107379

@rustbot

rustbot commented Jan 28, 2023

Copy link
Copy Markdown
Collaborator

r? @eholk

(rustbot has picked a reviewer for you, use r? to override)

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jan 28, 2023
@rustbot

rustbot commented Jan 28, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Comment thread compiler/rustc_trait_selection/src/solve/project_goals.rs Outdated
@bors

bors commented Jan 31, 2023

Copy link
Copy Markdown
Collaborator

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

@detrumi
detrumi force-pushed the builtin-impl-candidates branch from a0e6e3c to c03e49a Compare February 1, 2023 16:14
@detrumi
detrumi force-pushed the builtin-impl-candidates branch from c03e49a to de50a86 Compare February 1, 2023 16:15
Comment thread compiler/rustc_trait_selection/src/solve/project_goals.rs Outdated
@compiler-errors

Copy link
Copy Markdown
Contributor

r? @compiler-errors

@bors delegate+

@rustbot rustbot assigned compiler-errors and unassigned eholk Feb 2, 2023
@bors

bors commented Feb 2, 2023

Copy link
Copy Markdown
Collaborator

✌️ @detrumi can now approve this pull request

@detrumi

detrumi commented Feb 3, 2023

Copy link
Copy Markdown
Contributor Author

@bors r+

@bors

bors commented Feb 3, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit f29000e has been approved by detrumi

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 Feb 3, 2023
@lcnr

lcnr commented Feb 3, 2023

Copy link
Copy Markdown
Contributor

@bors rollup

@compiler-errors

compiler-errors commented Feb 3, 2023 •

Copy link
Copy Markdown
Contributor

@detrumi the syntax is r=Approver so the history doesn't think you approved the PR yourself 😅

@bors r+

@bors

bors commented Feb 3, 2023

Copy link
Copy Markdown
Collaborator

💡 This pull request was already approved, no need to approve it again.

@bors

bors commented Feb 3, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit f29000e has been approved by compiler-errors

It is now in the queue for this repository.

Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Feb 3, 2023
…=compiler-errors

Add candidates for DiscriminantKind builtin

Part of rust-lang#107379
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2023
Rollup of 6 pull requests

Successful merges:

 - rust-lang#107082 (Autotrait bounds on dyn-safe trait methods)
 - rust-lang#107427 (Add candidates for DiscriminantKind builtin)
 - rust-lang#107539 (Emit warnings on unused parens in index expressions)
 - rust-lang#107544 (Improve `TokenCursor`.)
 - rust-lang#107585 (Don't cause a cycle when formatting query description that references a FnDef)
 - rust-lang#107633 (Fix suggestion for coercing Option<&String> to Option<&str>)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit e1bf3a1 into rust-lang:master Feb 3, 2023
@rustbot rustbot added this to the 1.69.0 milestone Feb 3, 2023
@lcnr lcnr mentioned this pull request Feb 7, 2023
10 of 13 tasks
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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants