nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace calls to lower_generics with calls to add_implicit_generics

Browse Source
This commit is contained in:
Santiago Pastorino 2022-05-31 15:30:14 -03:00
parent 190b4a7152
commit e080298e35
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
1 changed files with 89 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
compiler/rustc_ast_lowering/src/item.rs
View File

@ -309,57 +309,59 @@ impl<'hir> LoweringContext<'_, 'hir> {
// //
// type Foo = Foo1 // type Foo = Foo1
// opaque type Foo1: Trait // opaque type Foo1: Trait
let ty = self.lower_ty(ty, ImplTraitContext::TypeAliasesOpaqueTy);
let mut generics = generics.clone(); let mut generics = generics.clone();
add_ty_alias_where_clause(&mut generics, where_clauses, true); add_ty_alias_where_clause(&mut generics, where_clauses, true);
let generics = self.lower_generics( let (generics, ty) = self.add_implicit_generics(
&generics, &generics,
id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
|this| this.lower_ty(ty, ImplTraitContext::TypeAliasesOpaqueTy),
); );
hir::ItemKind::TyAlias(ty, generics) hir::ItemKind::TyAlias(ty, generics)
} }
ItemKind::TyAlias(box TyAlias { ItemKind::TyAlias(box TyAlias {
ref generics, ref where_clauses, ty: None, .. ref generics, ref where_clauses, ty: None, ..
}) => { }) => {
let ty = self.arena.alloc(self.ty(span, hir::TyKind::Err));
let mut generics = generics.clone(); let mut generics = generics.clone();
add_ty_alias_where_clause(&mut generics, *where_clauses, true); add_ty_alias_where_clause(&mut generics, *where_clauses, true);
let generics = self.lower_generics( let (generics, ty) = self.add_implicit_generics(
&generics, &generics,
id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
|this| this.arena.alloc(this.ty(span, hir::TyKind::Err)),
); );
hir::ItemKind::TyAlias(ty, generics) hir::ItemKind::TyAlias(ty, generics)
} }
ItemKind::Enum(ref enum_definition, ref generics) => hir::ItemKind::Enum( ItemKind::Enum(ref enum_definition, ref generics) => {
hir::EnumDef { let (generics, variants) = self.add_implicit_generics(
variants: self.arena.alloc_from_iter(
enum_definition.variants.iter().map(|x| self.lower_variant(x)),
),
},
self.lower_generics(
generics, generics,
id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
), |this| {
), this.arena.alloc_from_iter(
enum_definition.variants.iter().map(|x| this.lower_variant(x)),
)
},
);
hir::ItemKind::Enum(hir::EnumDef { variants }, generics)
}
ItemKind::Struct(ref struct_def, ref generics) => { ItemKind::Struct(ref struct_def, ref generics) => {
let struct_def = self.lower_variant_data(hir_id, struct_def); let (generics, struct_def) = self.add_implicit_generics(
hir::ItemKind::Struct( generics,
struct_def, id,
self.lower_generics( ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
generics, |this| this.lower_variant_data(hir_id, struct_def),
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), );
), hir::ItemKind::Struct(struct_def, generics)
)
} }
ItemKind::Union(ref vdata, ref generics) => { ItemKind::Union(ref vdata, ref generics) => {
let vdata = self.lower_variant_data(hir_id, vdata); let (generics, vdata) = self.add_implicit_generics(
hir::ItemKind::Union( generics,
vdata, id,
self.lower_generics( ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
generics, |this| this.lower_variant_data(hir_id, vdata),
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), );
), hir::ItemKind::Union(vdata, generics)
)
} }
ItemKind::Impl(box Impl { ItemKind::Impl(box Impl {
unsafety, unsafety,
@ -431,34 +433,38 @@ impl<'hir> LoweringContext<'_, 'hir> {
ref bounds, ref bounds,
ref items, ref items,
}) => { }) => {
let bounds = self.lower_param_bounds( let (generics, (unsafety, items, bounds)) = self.add_implicit_generics(
bounds,
ImplTraitContext::Disallowed(ImplTraitPosition::Bound),
);
let items = self
.arena
.alloc_from_iter(items.iter().map(|item| self.lower_trait_item_ref(item)));
hir::ItemKind::Trait(
is_auto,
self.lower_unsafety(unsafety),
self.lower_generics(
generics,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
),
bounds,
items,
)
}
ItemKind::TraitAlias(ref generics, ref bounds) => hir::ItemKind::TraitAlias(
self.lower_generics(
generics, generics,
id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
), |this| {
self.lower_param_bounds( let bounds = this.lower_param_bounds(
bounds, bounds,
ImplTraitContext::Disallowed(ImplTraitPosition::Bound), ImplTraitContext::Disallowed(ImplTraitPosition::Bound),
), );
), let items = this.arena.alloc_from_iter(
items.iter().map(|item| this.lower_trait_item_ref(item)),
);
let unsafety = this.lower_unsafety(unsafety);
(unsafety, items, bounds)
},
);
hir::ItemKind::Trait(is_auto, unsafety, generics, bounds, items)
}
ItemKind::TraitAlias(ref generics, ref bounds) => {
let (generics, bounds) = self.add_implicit_generics(
generics,
id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
|this| {
this.lower_param_bounds(
bounds,
ImplTraitContext::Disallowed(ImplTraitPosition::Bound),
)
},
);
hir::ItemKind::TraitAlias(generics, bounds)
}
ItemKind::MacroDef(MacroDef { ref body, macro_rules }) => { ItemKind::MacroDef(MacroDef { ref body, macro_rules }) => {
let body = P(self.lower_mac_args(body)); let body = P(self.lower_mac_args(body));
let macro_kind = self.resolver.decl_macro_kind(self.resolver.local_def_id(id)); let macro_kind = self.resolver.decl_macro_kind(self.resolver.local_def_id(id));
@ -789,24 +795,25 @@ impl<'hir> LoweringContext<'_, 'hir> {
ref ty, ref ty,
.. ..
}) => { }) => {
let ty = ty.as_ref().map(|x| {
self.lower_ty(x, ImplTraitContext::Disallowed(ImplTraitPosition::Type))
});
let mut generics = generics.clone(); let mut generics = generics.clone();
add_ty_alias_where_clause(&mut generics, where_clauses, false); add_ty_alias_where_clause(&mut generics, where_clauses, false);
let generics = self.lower_generics( self.add_implicit_generics(
&generics, &generics,
i.id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
); |this| {
let kind = hir::TraitItemKind::Type( let ty = ty.as_ref().map(|x| {
self.lower_param_bounds( this.lower_ty(x, ImplTraitContext::Disallowed(ImplTraitPosition::Type))
bounds, });
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), hir::TraitItemKind::Type(
), this.lower_param_bounds(
ty, bounds,
); ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
),
(generics, kind) ty,
)
},
)
} }
AssocItemKind::MacCall(..) => panic!("macro item shouldn't exist at this point"), AssocItemKind::MacCall(..) => panic!("macro item shouldn't exist at this point"),
}; };
@ -876,21 +883,21 @@ impl<'hir> LoweringContext<'_, 'hir> {
AssocItemKind::TyAlias(box TyAlias { generics, where_clauses, ty, .. }) => { AssocItemKind::TyAlias(box TyAlias { generics, where_clauses, ty, .. }) => {
let mut generics = generics.clone(); let mut generics = generics.clone();
add_ty_alias_where_clause(&mut generics, *where_clauses, false); add_ty_alias_where_clause(&mut generics, *where_clauses, false);
let generics = self.lower_generics( self.add_implicit_generics(
&generics, &generics,
i.id,
ImplTraitContext::Disallowed(ImplTraitPosition::Generic), ImplTraitContext::Disallowed(ImplTraitPosition::Generic),
); |this| match ty {
let kind = match ty { None => {
None => { let ty = this.arena.alloc(this.ty(i.span, hir::TyKind::Err));
let ty = self.arena.alloc(self.ty(i.span, hir::TyKind::Err)); hir::ImplItemKind::TyAlias(ty)
hir::ImplItemKind::TyAlias(ty) }
} Some(ty) => {
Some(ty) => { let ty = this.lower_ty(ty, ImplTraitContext::TypeAliasesOpaqueTy);
let ty = self.lower_ty(ty, ImplTraitContext::TypeAliasesOpaqueTy); hir::ImplItemKind::TyAlias(ty)
hir::ImplItemKind::TyAlias(ty) }
} },
}; )
(generics, kind)
} }
AssocItemKind::MacCall(..) => panic!("`TyMac` should have been expanded by now"), AssocItemKind::MacCall(..) => panic!("`TyMac` should have been expanded by now"),
}; };
@ -1370,15 +1377,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
} }
} }
pub(super) fn lower_generics(
&mut self,
generics: &Generics,
itctx: ImplTraitContext,
) -> &'hir hir::Generics<'hir> {
let generics_ctor = self.lower_generics_mut(generics, itctx);
generics_ctor.into_generics(self.arena)
}
pub(super) fn lower_generic_bound_predicate( pub(super) fn lower_generic_bound_predicate(
&mut self, &mut self,
ident: Ident, ident: Ident,