diff options
| author | bors <bors@rust-lang.org> | 2024-11-12 02:51:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-12 02:51:21 +0000 |
| commit | 67f21277cd40cd12e69aa34089f4a20926fd6dc5 (patch) | |
| tree | f2c3806ccb3f4299a76226826369dcf63ab35deb /compiler/rustc_middle/src | |
| parent | 81eef2d362a6f03db6f8928f82d94298d31eb81b (diff) | |
| parent | 2d026525db557b3d15b69de405cf223dba8ae1e4 (diff) | |
| download | rust-67f21277cd40cd12e69aa34089f4a20926fd6dc5.tar.gz rust-67f21277cd40cd12e69aa34089f4a20926fd6dc5.zip | |
Auto merge of #132919 - matthiaskrgr:rollup-ogghyvp, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #120077 (Add Set entry API ) - #132144 (Arbitrary self types v2: (unused) Receiver trait) - #132297 (Document some `check_expr` methods, and other misc `hir_typeck` tweaks) - #132820 (Add a default implementation for CodegenBackend::link) - #132881 (triagebot: Autolabel rustdoc book) - #132912 (Simplify some places that deal with generic parameter defaults) - #132916 (Unvacation fmease) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_middle/src')
| -rw-r--r-- | compiler/rustc_middle/src/ty/generics.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/ty/generics.rs b/compiler/rustc_middle/src/ty/generics.rs index 19779740227..ce40ab18261 100644 --- a/compiler/rustc_middle/src/ty/generics.rs +++ b/compiler/rustc_middle/src/ty/generics.rs @@ -86,10 +86,10 @@ impl GenericParamDef { tcx: TyCtxt<'tcx>, ) -> Option<EarlyBinder<'tcx, ty::GenericArg<'tcx>>> { match self.kind { - GenericParamDefKind::Type { has_default, .. } if has_default => { + GenericParamDefKind::Type { has_default: true, .. } => { Some(tcx.type_of(self.def_id).map_bound(|t| t.into())) } - GenericParamDefKind::Const { has_default, .. } if has_default => { + GenericParamDefKind::Const { has_default: true, .. } => { Some(tcx.const_param_default(self.def_id).map_bound(|c| c.into())) } _ => None, |