diff options
| author | bors <bors@rust-lang.org> | 2025-07-08 03:30:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-08 03:30:58 +0000 |
| commit | 2783fc43fd13a669f314742890acd64200ad0bbf (patch) | |
| tree | 61f7b83de01b9a9625f848943694ab53af77e37f /compiler/rustc_middle/src/traits/select.rs | |
| parent | 688ea65df6a47866d0f72a00f1e18b47a7edf83b (diff) | |
| parent | fd05071727ede428ff9a3bf7844f22d2274b7363 (diff) | |
| download | rust-2783fc43fd13a669f314742890acd64200ad0bbf.tar.gz rust-2783fc43fd13a669f314742890acd64200ad0bbf.zip | |
Auto merge of #143621 - matthiaskrgr:rollup-p1ce8l7, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang/rust#142098 (Implement `int_format_into` feature) - rust-lang/rust#143567 (Point to correct argument in Func Call when Self type fails trait bound) - rust-lang/rust#143570 (consider nested cases for duplicate RPITIT) - rust-lang/rust#143571 (remove `has_nested` from builtin candidates) - rust-lang/rust#143586 (Fix wrong cache event query key) - rust-lang/rust#143589 (const-block-as-pattern: do not refer to no-longer-existing nightly feature) - rust-lang/rust#143608 (Fix in std::String docs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src/traits/select.rs')
| -rw-r--r-- | compiler/rustc_middle/src/traits/select.rs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/compiler/rustc_middle/src/traits/select.rs b/compiler/rustc_middle/src/traits/select.rs index aa2ee756bc5..c498e6b3c83 100644 --- a/compiler/rustc_middle/src/traits/select.rs +++ b/compiler/rustc_middle/src/traits/select.rs @@ -97,9 +97,7 @@ pub type EvaluationCache<'tcx, ENV> = Cache<(ENV, ty::PolyTraitPredicate<'tcx>), pub enum SelectionCandidate<'tcx> { /// A built-in implementation for the `Sized` trait. This is preferred /// over all other candidates. - SizedCandidate { - has_nested: bool, - }, + SizedCandidate, /// A builtin implementation for some specific traits, used in cases /// where we cannot rely an ordinary library implementations. @@ -107,10 +105,7 @@ pub enum SelectionCandidate<'tcx> { /// The most notable examples are `Copy` and `Clone`. This is also /// used for the `DiscriminantKind` and `Pointee` trait, both of which have /// an associated type. - BuiltinCandidate { - /// `false` if there are no *further* obligations. - has_nested: bool, - }, + BuiltinCandidate, /// Implementation of transmutability trait. TransmutabilityCandidate, |