Skip to content

move 2 candidates into builtin candidate #104716

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Nov 25, 2022
Merged

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Nov 22, 2022

having separate candidates for these isn't too helpful i think

r? types

@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 22, 2022
@lcnr lcnr force-pushed the selection-candidate branch from 87afbf1 to db1cdd4 Compare November 22, 2022 15:07
Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One nit then r=me

@@ -137,12 +137,6 @@ pub enum SelectionCandidate<'tcx> {
is_const: bool,
},

/// Builtin implementation of `DiscriminantKind`.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a comment to BuiltinCandidate to give some context of the types of predicates it covers?

@lcnr
Copy link
Contributor Author

lcnr commented Nov 23, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 23, 2022

📌 Commit f995583 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 23, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Nov 24, 2022
move 2 candidates into builtin candidate

having separate candidates for these isn't too helpful i think

r? types
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 24, 2022
move 2 candidates into builtin candidate

having separate candidates for these isn't too helpful i think

r? types
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 24, 2022
move 2 candidates into builtin candidate

having separate candidates for these isn't too helpful i think

r? types
@bors
Copy link
Collaborator

bors commented Nov 24, 2022

☔ The latest upstream changes (presumably #104321) 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 24, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 24, 2022
…iaskrgr

Rollup of 11 pull requests

Successful merges:

 - rust-lang#104514 (Use node_ty_opt to avoid ICE in visit_ty)
 - rust-lang#104704 (Allow power10-vector feature in PowerPC)
 - rust-lang#104747 (resolve: Don't use constructor def ids in the map for field names)
 - rust-lang#104773 (OpaqueCast projections are always overlapping, they can't possibly be disjoint)
 - rust-lang#104774 (Document split{_ascii,}_whitespace() for empty strings)
 - rust-lang#104780 (make `error_reported` check for delayed bugs)
 - rust-lang#104782 (Bump the const eval step limit)
 - rust-lang#104792 (rustdoc: simplify `.search-results-title` CSS)
 - rust-lang#104796 (lint: do not warn unused parens around higher-ranked function pointers)
 - rust-lang#104820 (Remove normalize_projection_type)
 - rust-lang#104822 (with_query_mode -> new)

Failed merges:

 - rust-lang#104716 (move 2 candidates into builtin candidate)
 - rust-lang#104841 (Assert that we don't capture escaping bound vars in `Fn` trait selection)

r? `@ghost`
`@rustbot` modify labels: rollup
@lcnr lcnr force-pushed the selection-candidate branch from f995583 to 84e9790 Compare November 25, 2022 10:59
@lcnr
Copy link
Contributor Author

lcnr commented Nov 25, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 25, 2022

📌 Commit 84e9790 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 25, 2022
@lcnr
Copy link
Contributor Author

lcnr commented Nov 25, 2022

@bors r=jackh726

@bors
Copy link
Collaborator

bors commented Nov 25, 2022

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

@bors
Copy link
Collaborator

bors commented Nov 25, 2022

📌 Commit 84e9790 has been approved by jackh726

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 25, 2022
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#104716 (move 2 candidates into builtin candidate)
 - rust-lang#104760 (Clarify `SyntaxExtensionKind::LegacyDerive`.)
 - rust-lang#104797 (rustc_codegen_ssa: write `.dwp` in a streaming fashion)
 - rust-lang#104835 (Use infcx.partially_normalize_associated_types_in)
 - rust-lang#104853 (Fix typo in miri sysroot)
 - rust-lang#104879 (jsondoclint: Recognise Typedef as valid kind for Type::ResolvedPath)
 - rust-lang#104887 (rustbuild: Don't build doc::SharedAssets when building JSON docs.)
 - rust-lang#104896 (rustdoc: fix broken tooltip CSS)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9c7dc3e into rust-lang:master Nov 25, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 25, 2022
@lcnr lcnr deleted the selection-candidate branch January 9, 2023 15:38
# for free to join this conversation on GitHub. Already have an account? # 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