mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

liar liar find_taits_declared_in_body on fire

Browse Source
This commit is contained in:
Oli Scherer 2023-06-29 07:02:29 +00:00
parent 2f89c963d3
commit a3ca139def
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/rustc_ty_utils/src/opaque_types.rs
View File

@ -291,11 +291,9 @@ fn opaque_types_defined_by<'tcx>(tcx: TyCtxt<'tcx>, item: LocalDefId) -> &'tcx [
// An item is allowed to constrain opaques declared within its own body (but not nested within // An item is allowed to constrain opaques declared within its own body (but not nested within
// nested functions). // nested functions).
for id in find_taits_declared_in_body(tcx, item) { for id in find_taits_declared_in_body(tcx, item) {
if let DefKind::TyAlias = tcx.def_kind(id) {
collector.opaques.extend(tcx.opaque_types_defined_by(id)) collector.opaques.extend(tcx.opaque_types_defined_by(id))
} }
} }
}
DefKind::TyAlias | DefKind::AssocTy => { DefKind::TyAlias | DefKind::AssocTy => {
tcx.type_of(item).subst_identity().visit_with(&mut collector); tcx.type_of(item).subst_identity().visit_with(&mut collector);
} }
@ -335,22 +333,24 @@ fn opaque_types_defined_by<'tcx>(tcx: TyCtxt<'tcx>, item: LocalDefId) -> &'tcx [
} }
} }
#[instrument(level = "trace", skip(tcx), ret)]
fn find_taits_declared_in_body(tcx: TyCtxt<'_>, item: LocalDefId) -> Vec<LocalDefId> { fn find_taits_declared_in_body(tcx: TyCtxt<'_>, item: LocalDefId) -> Vec<LocalDefId> {
let body = tcx.hir().body(tcx.hir().body_owned_by(item)).value; let body = tcx.hir().body(tcx.hir().body_owned_by(item)).value;
#[derive(Default, Debug)] struct TaitInBodyFinder<'tcx> {
struct TaitInBodyFinder {
/// Ids of type aliases found in the body /// Ids of type aliases found in the body
type_aliases: Vec<LocalDefId>, type_aliases: Vec<LocalDefId>,
tcx: TyCtxt<'tcx>,
} }
impl<'v> intravisit::Visitor<'v> for TaitInBodyFinder { impl<'v> intravisit::Visitor<'v> for TaitInBodyFinder<'_> {
#[instrument(level = "trace")] #[instrument(level = "trace", skip(self))]
fn visit_nested_item(&mut self, id: rustc_hir::ItemId) { fn visit_nested_item(&mut self, id: rustc_hir::ItemId) {
let id = id.owner_id.def_id; let id = id.owner_id.def_id;
if let DefKind::TyAlias = self.tcx.def_kind(id) {
self.type_aliases.push(id); self.type_aliases.push(id);
} }
} }
let mut visitor = TaitInBodyFinder::default(); }
trace!(?body); let mut visitor = TaitInBodyFinder { type_aliases: Default::default(), tcx };
visitor.visit_expr(body); visitor.visit_expr(body);
visitor.type_aliases visitor.type_aliases
} }