nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-09 21:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate handling of early-bound params in RTN

Browse Source
This commit is contained in:
Michael Goulet 2024-10-22 19:58:15 +00:00
parent 0b52ec3d7e
commit 1b7a91ed71
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
View File

@ -291,6 +291,21 @@ fn late_arg_as_bound_arg<'tcx>(
} }
} }
/// Turn a [`ty::GenericParamDef`] into a bound arg. Generally, this should only
/// be used when turning early-bound vars into late-bound vars when lowering
/// return type notation.
fn generic_param_def_as_bound_arg(param: &ty::GenericParamDef) -> ty::BoundVariableKind {
match param.kind {
ty::GenericParamDefKind::Lifetime => {
ty::BoundVariableKind::Region(ty::BoundRegionKind::BrNamed(param.def_id, param.name))
}
ty::GenericParamDefKind::Type { .. } => {
ty::BoundVariableKind::Ty(ty::BoundTyKind::Param(param.def_id, param.name))
}
ty::GenericParamDefKind::Const { .. } => ty::BoundVariableKind::Const,
}
}
impl<'a, 'tcx> BoundVarContext<'a, 'tcx> { impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
/// Returns the binders in scope and the type of `Binder` that should be created for a poly trait ref. /// Returns the binders in scope and the type of `Binder` that should be created for a poly trait ref.
fn poly_trait_ref_binder_info(&mut self) -> (Vec<ty::BoundVariableKind>, BinderScopeType) { fn poly_trait_ref_binder_info(&mut self) -> (Vec<ty::BoundVariableKind>, BinderScopeType) {
@ -1628,17 +1643,13 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
constraint.ident, constraint.ident,
ty::AssocKind::Fn, ty::AssocKind::Fn,
) { ) {
bound_vars.extend(self.tcx.generics_of(assoc_fn.def_id).own_params.iter().map( bound_vars.extend(
|param| match param.kind { self.tcx
ty::GenericParamDefKind::Lifetime => ty::BoundVariableKind::Region( .generics_of(assoc_fn.def_id)
ty::BoundRegionKind::BrNamed(param.def_id, param.name), .own_params
), .iter()
ty::GenericParamDefKind::Type { .. } => ty::BoundVariableKind::Ty( .map(|param| generic_param_def_as_bound_arg(param)),
ty::BoundTyKind::Param(param.def_id, param.name), );
),
ty::GenericParamDefKind::Const { .. } => ty::BoundVariableKind::Const,
},
));
bound_vars.extend( bound_vars.extend(
self.tcx.fn_sig(assoc_fn.def_id).instantiate_identity().bound_vars(), self.tcx.fn_sig(assoc_fn.def_id).instantiate_identity().bound_vars(),
); );
@ -1957,17 +1968,13 @@ impl<'a, 'tcx> BoundVarContext<'a, 'tcx> {
// Append the early-bound vars on the function, and then the late-bound ones. // Append the early-bound vars on the function, and then the late-bound ones.
// We actually turn type parameters into higher-ranked types here, but we // We actually turn type parameters into higher-ranked types here, but we
// deny them later in HIR lowering. // deny them later in HIR lowering.
bound_vars.extend(self.tcx.generics_of(item_def_id).own_params.iter().map(|param| { bound_vars.extend(
match param.kind { self.tcx
ty::GenericParamDefKind::Lifetime => ty::BoundVariableKind::Region( .generics_of(item_def_id)
ty::BoundRegionKind::BrNamed(param.def_id, param.name), .own_params
), .iter()
ty::GenericParamDefKind::Type { .. } => { .map(|param| generic_param_def_as_bound_arg(param)),
ty::BoundVariableKind::Ty(ty::BoundTyKind::Param(param.def_id, param.name)) );
}
ty::GenericParamDefKind::Const { .. } => ty::BoundVariableKind::Const,
}
}));
bound_vars.extend(self.tcx.fn_sig(item_def_id).instantiate_identity().bound_vars()); bound_vars.extend(self.tcx.fn_sig(item_def_id).instantiate_identity().bound_vars());
// SUBTLE: Stash the old bound vars onto the *item segment* before appending // SUBTLE: Stash the old bound vars onto the *item segment* before appending