Rename Generics::params to Generics::own_params
This commit is contained in:
parent
8c7c151a7a
commit
1c19b6ad60
54 changed files with 177 additions and 169 deletions
|
@ -340,22 +340,22 @@ fn associated_type_for_impl_trait_in_impl(
|
|||
impl_assoc_ty.generics_of({
|
||||
let trait_assoc_generics = tcx.generics_of(trait_assoc_def_id);
|
||||
let trait_assoc_parent_count = trait_assoc_generics.parent_count;
|
||||
let mut params = trait_assoc_generics.params.clone();
|
||||
let mut own_params = trait_assoc_generics.own_params.clone();
|
||||
|
||||
let parent_generics = tcx.generics_of(impl_local_def_id.to_def_id());
|
||||
let parent_count = parent_generics.parent_count + parent_generics.params.len();
|
||||
let parent_count = parent_generics.parent_count + parent_generics.own_params.len();
|
||||
|
||||
for param in &mut params {
|
||||
for param in &mut own_params {
|
||||
param.index = param.index + parent_count as u32 - trait_assoc_parent_count as u32;
|
||||
}
|
||||
|
||||
let param_def_id_to_index =
|
||||
params.iter().map(|param| (param.def_id, param.index)).collect();
|
||||
own_params.iter().map(|param| (param.def_id, param.index)).collect();
|
||||
|
||||
ty::Generics {
|
||||
parent: Some(impl_local_def_id.to_def_id()),
|
||||
parent_count,
|
||||
params,
|
||||
own_params,
|
||||
param_def_id_to_index,
|
||||
has_self: false,
|
||||
has_late_bound_regions: trait_assoc_generics.has_late_bound_regions,
|
||||
|
|
|
@ -69,7 +69,8 @@ fn assumed_wf_types<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> &'tcx [(Ty<'
|
|||
// case, since it has been liberated), map it back to the early-bound lifetime of
|
||||
// the GAT. Since RPITITs also have all of the fn's generics, we slice only
|
||||
// the end of the list corresponding to the opaque's generics.
|
||||
for param in &generics.params[tcx.generics_of(fn_def_id).params.len()..] {
|
||||
for param in &generics.own_params[tcx.generics_of(fn_def_id).own_params.len()..]
|
||||
{
|
||||
let orig_lt =
|
||||
tcx.map_opaque_lifetime_to_parent_lifetime(param.def_id.expect_local());
|
||||
if matches!(*orig_lt, ty::ReLateParam(..)) {
|
||||
|
|
|
@ -85,7 +85,7 @@ fn representability_adt_ty<'tcx>(tcx: TyCtxt<'tcx>, ty: Ty<'tcx>) -> Representab
|
|||
fn params_in_repr(tcx: TyCtxt<'_>, def_id: LocalDefId) -> BitSet<u32> {
|
||||
let adt_def = tcx.adt_def(def_id);
|
||||
let generics = tcx.generics_of(def_id);
|
||||
let mut params_in_repr = BitSet::new_empty(generics.params.len());
|
||||
let mut params_in_repr = BitSet::new_empty(generics.own_params.len());
|
||||
for variant in adt_def.variants() {
|
||||
for field in variant.fields.iter() {
|
||||
params_in_repr_ty(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue