move 2 candidates into builtin candidate #104716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
lcnr
force-pushed
the
selection-candidate
branch
from
87afbf1 to
db1cdd4
Compare
jackh726
approved these changes
Nov 22, 2022
| @@ -137,12 +137,6 @@ pub enum SelectionCandidate<'tcx> { | |||
| is_const: bool, | |||
| }, | |||
|
|
|||
| /// Builtin implementation of `DiscriminantKind`. | |||
There was a problem hiding this comment.
Can you add a comment to BuiltinCandidate to give some context of the types of predicates it covers?
|
@bors r+ |
bors
added
S-waiting-on-bors
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
This was referenced Nov 24, 2022
|
☔ The latest upstream changes (presumably #104321) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
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
force-pushed
the
selection-candidate
branch
from
f995583 to
84e9790
Compare
|
@bors r+ |
bors
added
S-waiting-on-bors
|
@bors r=jackh726 |
|
💡 This pull request was already approved, no need to approve it again.
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
having separate candidates for these isn't too helpful i think
r? types