From a54683ba2f68f38917868a1287c6d748d2c25799 Mon Sep 17 00:00:00 2001 From: Adrian Palacios Date: Mon, 11 Mar 2024 17:26:56 +0000 Subject: [PATCH] Use exhaustive `match` to filter --- compiler/rustc_smir/src/rustc_smir/context.rs | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/compiler/rustc_smir/src/rustc_smir/context.rs b/compiler/rustc_smir/src/rustc_smir/context.rs index eb9138f614d74..ea3494264fad1 100644 --- a/compiler/rustc_smir/src/rustc_smir/context.rs +++ b/compiler/rustc_smir/src/rustc_smir/context.rs @@ -591,13 +591,23 @@ impl<'tcx> Context for TablesWrapper<'tcx> { fn intrinsic_name(&self, def: InstanceDef) -> Option { let tables = self.0.borrow_mut(); let instance = tables.instances[def]; - if !(matches!(instance.def, ty::InstanceDef::Intrinsic(..)) - || matches!(instance.def, ty::InstanceDef::Item(..))) - { - return None; + match instance.def { + ty::InstanceDef::Intrinsic(..) | ty::InstanceDef::Item(..) => { + let intrinsic = tables.tcx.intrinsic(instance.def_id())?; + Some(intrinsic.name.to_string()) + } + ty::InstanceDef::VTableShim(..) + | ty::InstanceDef::ReifyShim(..) + | ty::InstanceDef::Virtual(..) + | ty::InstanceDef::ThreadLocalShim(..) + | ty::InstanceDef::ClosureOnceShim { .. } + | ty::InstanceDef::ConstructCoroutineInClosureShim { .. } + | ty::InstanceDef::CoroutineKindShim { .. } + | ty::InstanceDef::DropGlue(..) + | ty::InstanceDef::FnPtrShim(..) + | ty::InstanceDef::CloneShim(..) + | ty::InstanceDef::FnPtrAddrShim(..) => None, } - let intrinsic = tables.tcx.intrinsic(instance.def_id())?; - Some(intrinsic.name.to_string()) } fn ty_layout(&self, ty: Ty) -> Result {