-
Notifications
You must be signed in to change notification settings - Fork 13.5k
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
Conversation
87afbf1
to
db1cdd4
Compare
There was a problem hiding this 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`. |
There was a problem hiding this comment.
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?
@bors r+ |
move 2 candidates into builtin candidate having separate candidates for these isn't too helpful i think r? types
move 2 candidates into builtin candidate having separate candidates for these isn't too helpful i think r? types
move 2 candidates into builtin candidate having separate candidates for these isn't too helpful i think r? types
☔ The latest upstream changes (presumably #104321) made this pull request unmergeable. Please resolve the merge conflicts. |
…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
f995583
to
84e9790
Compare
@bors r+ |
@bors r=jackh726 |
💡 This pull request was already approved, no need to approve it again.
|
…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
having separate candidates for these isn't too helpful i think
r? types