Use macros to avoid expect_* boilerplate.

The majority of these aren't actually used, but I kept them anyway.

compiler/rustc_hir/src/hir.rs

@@ -2267,6 +2267,35 @@ pub struct TraitItem<'hir> {
     pub defaultness: Defaultness,
 }
 
+macro_rules! expect_methods_self_kind {
+    ( $( $name:ident, $ret_ty:ty, $pat:pat, $ret_val:expr; )* ) => {
+        $(
+            #[track_caller]
+            pub fn $name(&self) -> $ret_ty {
+                let $pat = &self.kind else { expect_failed(stringify!($ident), self) };
+                $ret_val
+            }
+        )*
+    }
+}
+
+macro_rules! expect_methods_self {
+    ( $( $name:ident, $ret_ty:ty, $pat:pat, $ret_val:expr; )* ) => {
+        $(
+            #[track_caller]
+            pub fn $name(&self) -> $ret_ty {
+                let $pat = self else { expect_failed(stringify!($ident), self) };
+                $ret_val
+            }
+        )*
+    }
+}
+
+#[track_caller]
+fn expect_failed<T: fmt::Debug>(ident: &'static str, found: T) -> ! {
+    panic!("{ident}: found {found:?}")
+}
+
 impl<'hir> TraitItem<'hir> {
     #[inline]
     pub fn hir_id(&self) -> HirId {
@@ -2278,30 +2307,15 @@ impl<'hir> TraitItem<'hir> {
         TraitItemId { owner_id: self.owner_id }
     }
 
-    /// Expect an [`TraitItemKind::Const`] or panic.
+    expect_methods_self_kind! {
-    #[track_caller]
+        expect_const, (&'hir Ty<'hir>, Option<BodyId>),
-    pub fn expect_const(&self) -> (&'hir Ty<'hir>, Option<BodyId>) {
+            TraitItemKind::Const(ty, body), (ty, *body);
-        let TraitItemKind::Const(ty, body) = self.kind else { self.expect_failed("a constant") };
-        (ty, body)
-    }
 
-    /// Expect an [`TraitItemKind::Fn`] or panic.
+        expect_fn, (&FnSig<'hir>, &TraitFn<'hir>),
-    #[track_caller]
+            TraitItemKind::Fn(ty, trfn), (ty, trfn);
-    pub fn expect_fn(&self) -> (&FnSig<'hir>, &TraitFn<'hir>) {
-        let TraitItemKind::Fn(ty, trfn) = &self.kind else { self.expect_failed("a function") };
-        (ty, trfn)
-    }
 
-    /// Expect an [`TraitItemKind::Type`] or panic.
+        expect_type, (GenericBounds<'hir>, Option<&'hir Ty<'hir>>),
-    #[track_caller]
+            TraitItemKind::Type(bounds, ty), (bounds, *ty);
-    pub fn expect_type(&self) -> (GenericBounds<'hir>, Option<&'hir Ty<'hir>>) {
-        let TraitItemKind::Type(bounds, ty) = self.kind else { self.expect_failed("a type") };
-        (bounds, ty)
-    }
-
-    #[track_caller]
-    fn expect_failed(&self, expected: &'static str) -> ! {
-        panic!("expected {expected} item, found {self:?}")
     }
 }
 
@@ -2366,30 +2380,10 @@ impl<'hir> ImplItem<'hir> {
         ImplItemId { owner_id: self.owner_id }
     }
 
-    /// Expect an [`ImplItemKind::Const`] or panic.
+    expect_methods_self_kind! {
-    #[track_caller]
+        expect_const, (&'hir Ty<'hir>, BodyId), ImplItemKind::Const(ty, body), (ty, *body);
-    pub fn expect_const(&self) -> (&'hir Ty<'hir>, BodyId) {
+        expect_fn,    (&FnSig<'hir>, BodyId),   ImplItemKind::Fn(ty, body),    (ty, *body);
-        let ImplItemKind::Const(ty, body) = self.kind else { self.expect_failed("a constant") };
+        expect_type,  &'hir Ty<'hir>,           ImplItemKind::Type(ty),        ty;
-        (ty, body)
-    }
-
-    /// Expect an [`ImplItemKind::Fn`] or panic.
-    #[track_caller]
-    pub fn expect_fn(&self) -> (&FnSig<'hir>, BodyId) {
-        let ImplItemKind::Fn(ty, body) = &self.kind else { self.expect_failed("a function") };
-        (ty, *body)
-    }
-
-    /// Expect an [`ImplItemKind::Type`] or panic.
-    #[track_caller]
-    pub fn expect_type(&self) -> &'hir Ty<'hir> {
-        let ImplItemKind::Type(ty) = self.kind else { self.expect_failed("a type") };
-        ty
-    }
-
-    #[track_caller]
-    fn expect_failed(&self, expected: &'static str) -> ! {
-        panic!("expected {expected} item, found {self:?}")
     }
 }
 
@@ -3075,134 +3069,51 @@ impl<'hir> Item<'hir> {
         ItemId { owner_id: self.owner_id }
     }
 
-    /// Expect an [`ItemKind::ExternCrate`] or panic.
+    expect_methods_self_kind! {
-    #[track_caller]
+        expect_extern_crate, Option<Symbol>, ItemKind::ExternCrate(s), *s;
-    pub fn expect_extern_crate(&self) -> Option<Symbol> {
-        let ItemKind::ExternCrate(s) = self.kind else { self.expect_failed("an extern crate") };
-        s
-    }
 
-    /// Expect an [`ItemKind::Use`] or panic.
+        expect_use, (&'hir UsePath<'hir>, UseKind), ItemKind::Use(p, uk), (p, *uk);
-    #[track_caller]
-    pub fn expect_use(&self) -> (&'hir UsePath<'hir>, UseKind) {
-        let ItemKind::Use(p, uk) = self.kind else { self.expect_failed("a use") };
-        (p, uk)
-    }
 
-    /// Expect an [`ItemKind::Static`] or panic.
+        expect_static, (&'hir Ty<'hir>, Mutability, BodyId),
-    #[track_caller]
+            ItemKind::Static(ty, mutbl, body), (ty, *mutbl, *body);
-    pub fn expect_static(&self) -> (&'hir Ty<'hir>, Mutability, BodyId) {
-        let ItemKind::Static(ty, mutbl, body) = self.kind else { self.expect_failed("a static") };
-        (ty, mutbl, body)
-    }
-    /// Expect an [`ItemKind::Const`] or panic.
-    #[track_caller]
-    pub fn expect_const(&self) -> (&'hir Ty<'hir>, &'hir Generics<'hir>, BodyId) {
-        let ItemKind::Const(ty, gen, body) = self.kind else { self.expect_failed("a constant") };
-        (ty, gen, body)
-    }
-    /// Expect an [`ItemKind::Fn`] or panic.
-    #[track_caller]
-    pub fn expect_fn(&self) -> (&FnSig<'hir>, &'hir Generics<'hir>, BodyId) {
-        let ItemKind::Fn(sig, gen, body) = &self.kind else { self.expect_failed("a function") };
-        (sig, gen, *body)
-    }
 
-    /// Expect an [`ItemKind::Macro`] or panic.
+        expect_const, (&'hir Ty<'hir>, &'hir Generics<'hir>, BodyId),
-    #[track_caller]
+            ItemKind::Const(ty, gen, body), (ty, gen, *body);
-    pub fn expect_macro(&self) -> (&ast::MacroDef, MacroKind) {
-        let ItemKind::Macro(def, mk) = &self.kind else { self.expect_failed("a macro") };
-        (def, *mk)
-    }
 
-    /// Expect an [`ItemKind::Mod`] or panic.
+        expect_fn, (&FnSig<'hir>, &'hir Generics<'hir>, BodyId),
-    #[track_caller]
+            ItemKind::Fn(sig, gen, body), (sig, gen, *body);
-    pub fn expect_mod(&self) -> &'hir Mod<'hir> {
-        let ItemKind::Mod(m) = self.kind else { self.expect_failed("a module") };
-        m
-    }
 
-    /// Expect an [`ItemKind::ForeignMod`] or panic.
+        expect_macro, (&ast::MacroDef, MacroKind), ItemKind::Macro(def, mk), (def, *mk);
-    #[track_caller]
-    pub fn expect_foreign_mod(&self) -> (Abi, &'hir [ForeignItemRef]) {
-        let ItemKind::ForeignMod { abi, items } = self.kind else {
-            self.expect_failed("a foreign module")
-        };
-        (abi, items)
-    }
 
-    /// Expect an [`ItemKind::GlobalAsm`] or panic.
+        expect_mod, &'hir Mod<'hir>, ItemKind::Mod(m), m;
-    #[track_caller]
-    pub fn expect_global_asm(&self) -> &'hir InlineAsm<'hir> {
-        let ItemKind::GlobalAsm(asm) = self.kind else { self.expect_failed("a global asm") };
-        asm
-    }
 
-    /// Expect an [`ItemKind::TyAlias`] or panic.
+        expect_foreign_mod, (Abi, &'hir [ForeignItemRef]),
-    #[track_caller]
+            ItemKind::ForeignMod { abi, items }, (*abi, items);
-    pub fn expect_ty_alias(&self) -> (&'hir Ty<'hir>, &'hir Generics<'hir>) {
-        let ItemKind::TyAlias(ty, gen) = self.kind else { self.expect_failed("a type alias") };
-        (ty, gen)
-    }
 
-    /// Expect an [`ItemKind::OpaqueTy`] or panic.
+        expect_global_asm, &'hir InlineAsm<'hir>, ItemKind::GlobalAsm(asm), asm;
-    #[track_caller]
-    pub fn expect_opaque_ty(&self) -> &OpaqueTy<'hir> {
-        let ItemKind::OpaqueTy(ty) = &self.kind else { self.expect_failed("an opaque type") };
-        ty
-    }
 
-    /// Expect an [`ItemKind::Enum`] or panic.
+        expect_ty_alias, (&'hir Ty<'hir>, &'hir Generics<'hir>),
-    #[track_caller]
+            ItemKind::TyAlias(ty, gen), (ty, gen);
-    pub fn expect_enum(&self) -> (&EnumDef<'hir>, &'hir Generics<'hir>) {
-        let ItemKind::Enum(def, gen) = &self.kind else { self.expect_failed("an enum") };
-        (def, gen)
-    }
 
-    /// Expect an [`ItemKind::Struct`] or panic.
+        expect_opaque_ty, &OpaqueTy<'hir>, ItemKind::OpaqueTy(ty), ty;
-    #[track_caller]
-    pub fn expect_struct(&self) -> (&VariantData<'hir>, &'hir Generics<'hir>) {
-        let ItemKind::Struct(data, gen) = &self.kind else { self.expect_failed("a struct") };
-        (data, gen)
-    }
 
-    /// Expect an [`ItemKind::Union`] or panic.
+        expect_enum, (&EnumDef<'hir>, &'hir Generics<'hir>), ItemKind::Enum(def, gen), (def, gen);
-    #[track_caller]
-    pub fn expect_union(&self) -> (&VariantData<'hir>, &'hir Generics<'hir>) {
-        let ItemKind::Union(data, gen) = &self.kind else { self.expect_failed("a union") };
-        (data, gen)
-    }
 
-    /// Expect an [`ItemKind::Trait`] or panic.
+        expect_struct, (&VariantData<'hir>, &'hir Generics<'hir>),
-    #[track_caller]
+            ItemKind::Struct(data, gen), (data, gen);
-    pub fn expect_trait(
-        self,
-    ) -> (IsAuto, Unsafety, &'hir Generics<'hir>, GenericBounds<'hir>, &'hir [TraitItemRef]) {
-        let ItemKind::Trait(is_auto, unsafety, gen, bounds, items) = self.kind else {
-            self.expect_failed("a trait")
-        };
-        (is_auto, unsafety, gen, bounds, items)
-    }
 
-    /// Expect an [`ItemKind::TraitAlias`] or panic.
+        expect_union, (&VariantData<'hir>, &'hir Generics<'hir>),
-    #[track_caller]
+            ItemKind::Union(data, gen), (data, gen);
-    pub fn expect_trait_alias(&self) -> (&'hir Generics<'hir>, GenericBounds<'hir>) {
-        let ItemKind::TraitAlias(gen, bounds) = self.kind else {
-            self.expect_failed("a trait alias")
-        };
-        (gen, bounds)
-    }
 
-    /// Expect an [`ItemKind::Impl`] or panic.
+        expect_trait,
-    #[track_caller]
+            (IsAuto, Unsafety, &'hir Generics<'hir>, GenericBounds<'hir>, &'hir [TraitItemRef]),
-    pub fn expect_impl(&self) -> &'hir Impl<'hir> {
+            ItemKind::Trait(is_auto, unsafety, gen, bounds, items),
-        let ItemKind::Impl(imp) = self.kind else { self.expect_failed("an impl") };
+            (*is_auto, *unsafety, gen, bounds, items);
-        imp
-    }
 
-    #[track_caller]
+        expect_trait_alias, (&'hir Generics<'hir>, GenericBounds<'hir>),
-    fn expect_failed(&self, expected: &'static str) -> ! {
+            ItemKind::TraitAlias(gen, bounds), (gen, bounds);
-        panic!("expected {expected} item, found {self:?}")
+
+        expect_impl, &'hir Impl<'hir>, ItemKind::Impl(imp), imp;
     }
 }
 
@@ -3574,32 +3485,11 @@ impl<'hir> OwnerNode<'hir> {
         }
     }
 
-    pub fn expect_item(self) -> &'hir Item<'hir> {
+    expect_methods_self! {
-        match self {
+        expect_item,         &'hir Item<'hir>,        OwnerNode::Item(n),        n;
-            OwnerNode::Item(n) => n,
+        expect_foreign_item, &'hir ForeignItem<'hir>, OwnerNode::ForeignItem(n), n;
-            _ => panic!(),
+        expect_impl_item,    &'hir ImplItem<'hir>,    OwnerNode::ImplItem(n),    n;
-        }
+        expect_trait_item,   &'hir TraitItem<'hir>,   OwnerNode::TraitItem(n),   n;
-    }
-
-    pub fn expect_foreign_item(self) -> &'hir ForeignItem<'hir> {
-        match self {
-            OwnerNode::ForeignItem(n) => n,
-            _ => panic!(),
-        }
-    }
-
-    pub fn expect_impl_item(self) -> &'hir ImplItem<'hir> {
-        match self {
-            OwnerNode::ImplItem(n) => n,
-            _ => panic!(),
-        }
-    }
-
-    pub fn expect_trait_item(self) -> &'hir TraitItem<'hir> {
-        match self {
-            OwnerNode::TraitItem(n) => n,
-            _ => panic!(),
-        }
     }
 }
 
@@ -3852,190 +3742,33 @@ impl<'hir> Node<'hir> {
         }
     }
 
-    /// Expect a [`Node::Param`] or panic.
+    expect_methods_self! {
-    #[track_caller]
+        expect_param,         &'hir Param<'hir>,        Node::Param(n),        n;
-    pub fn expect_param(self) -> &'hir Param<'hir> {
+        expect_item,          &'hir Item<'hir>,         Node::Item(n),         n;
-        let Node::Param(this) = self else { self.expect_failed("a parameter") };
+        expect_foreign_item,  &'hir ForeignItem<'hir>,  Node::ForeignItem(n),  n;
-        this
+        expect_trait_item,    &'hir TraitItem<'hir>,    Node::TraitItem(n),    n;
-    }
+        expect_impl_item,     &'hir ImplItem<'hir>,     Node::ImplItem(n),     n;
-
+        expect_variant,       &'hir Variant<'hir>,      Node::Variant(n),      n;
-    /// Expect a [`Node::Item`] or panic.
+        expect_field,         &'hir FieldDef<'hir>,     Node::Field(n),        n;
-    #[track_caller]
+        expect_anon_const,    &'hir AnonConst,          Node::AnonConst(n),    n;
-    pub fn expect_item(self) -> &'hir Item<'hir> {
+        expect_inline_const,  &'hir ConstBlock,         Node::ConstBlock(n),   n;
-        let Node::Item(this) = self else { self.expect_failed("a item") };
+        expect_expr,          &'hir Expr<'hir>,         Node::Expr(n),         n;
-        this
+        expect_expr_field,    &'hir ExprField<'hir>,    Node::ExprField(n),    n;
-    }
+        expect_stmt,          &'hir Stmt<'hir>,         Node::Stmt(n),         n;
-
+        expect_path_segment,  &'hir PathSegment<'hir>,  Node::PathSegment(n),  n;
-    /// Expect a [`Node::ForeignItem`] or panic.
+        expect_ty,            &'hir Ty<'hir>,           Node::Ty(n),           n;
-    #[track_caller]
+        expect_type_binding,  &'hir TypeBinding<'hir>,  Node::TypeBinding(n),  n;
-    pub fn expect_foreign_item(self) -> &'hir ForeignItem<'hir> {
+        expect_trait_ref,     &'hir TraitRef<'hir>,     Node::TraitRef(n),     n;
-        let Node::ForeignItem(this) = self else { self.expect_failed("a foreign item") };
+        expect_pat,           &'hir Pat<'hir>,          Node::Pat(n),          n;
-        this
+        expect_pat_field,     &'hir PatField<'hir>,     Node::PatField(n),     n;
-    }
+        expect_arm,           &'hir Arm<'hir>,          Node::Arm(n),          n;
-
+        expect_block,         &'hir Block<'hir>,        Node::Block(n),        n;
-    /// Expect a [`Node::TraitItem`] or panic.
+        expect_local,         &'hir Local<'hir>,        Node::Local(n),        n;
-    #[track_caller]
+        expect_ctor,          &'hir VariantData<'hir>,  Node::Ctor(n),         n;
-    pub fn expect_trait_item(self) -> &'hir TraitItem<'hir> {
+        expect_lifetime,      &'hir Lifetime,           Node::Lifetime(n),     n;
-        let Node::TraitItem(this) = self else { self.expect_failed("a trait item") };
+        expect_generic_param, &'hir GenericParam<'hir>, Node::GenericParam(n), n;
-        this
+        expect_crate,         &'hir Mod<'hir>,          Node::Crate(n),        n;
-    }
+        expect_infer,         &'hir InferArg,           Node::Infer(n),        n;
-
-    /// Expect a [`Node::ImplItem`] or panic.
-    #[track_caller]
-    pub fn expect_impl_item(self) -> &'hir ImplItem<'hir> {
-        let Node::ImplItem(this) = self else { self.expect_failed("an implementation item") };
-        this
-    }
-
-    /// Expect a [`Node::Variant`] or panic.
-    #[track_caller]
-    pub fn expect_variant(self) -> &'hir Variant<'hir> {
-        let Node::Variant(this) = self else { self.expect_failed("a variant") };
-        this
-    }
-
-    /// Expect a [`Node::Field`] or panic.
-    #[track_caller]
-    pub fn expect_field(self) -> &'hir FieldDef<'hir> {
-        let Node::Field(this) = self else { self.expect_failed("a field definition") };
-        this
-    }
-
-    /// Expect a [`Node::AnonConst`] or panic.
-    #[track_caller]
-    pub fn expect_anon_const(self) -> &'hir AnonConst {
-        let Node::AnonConst(this) = self else { self.expect_failed("an anonymous constant") };
-        this
-    }
-
-    /// Expect a [`Node::ConstBlock`] or panic.
-    #[track_caller]
-    pub fn expect_inline_const(self) -> &'hir ConstBlock {
-        let Node::ConstBlock(this) = self else { self.expect_failed("an inline constant") };
-        this
-    }
-
-    /// Expect a [`Node::Expr`] or panic.
-    #[track_caller]
-    pub fn expect_expr(self) -> &'hir Expr<'hir> {
-        let Node::Expr(this) = self else { self.expect_failed("an expression") };
-        this
-    }
-    /// Expect a [`Node::ExprField`] or panic.
-    #[track_caller]
-    pub fn expect_expr_field(self) -> &'hir ExprField<'hir> {
-        let Node::ExprField(this) = self else { self.expect_failed("an expression field") };
-        this
-    }
-
-    /// Expect a [`Node::Stmt`] or panic.
-    #[track_caller]
-    pub fn expect_stmt(self) -> &'hir Stmt<'hir> {
-        let Node::Stmt(this) = self else { self.expect_failed("a statement") };
-        this
-    }
-
-    /// Expect a [`Node::PathSegment`] or panic.
-    #[track_caller]
-    pub fn expect_path_segment(self) -> &'hir PathSegment<'hir> {
-        let Node::PathSegment(this) = self else { self.expect_failed("a path segment") };
-        this
-    }
-
-    /// Expect a [`Node::Ty`] or panic.
-    #[track_caller]
-    pub fn expect_ty(self) -> &'hir Ty<'hir> {
-        let Node::Ty(this) = self else { self.expect_failed("a type") };
-        this
-    }
-
-    /// Expect a [`Node::TypeBinding`] or panic.
-    #[track_caller]
-    pub fn expect_type_binding(self) -> &'hir TypeBinding<'hir> {
-        let Node::TypeBinding(this) = self else { self.expect_failed("a type binding") };
-        this
-    }
-
-    /// Expect a [`Node::TraitRef`] or panic.
-    #[track_caller]
-    pub fn expect_trait_ref(self) -> &'hir TraitRef<'hir> {
-        let Node::TraitRef(this) = self else { self.expect_failed("a trait reference") };
-        this
-    }
-
-    /// Expect a [`Node::Pat`] or panic.
-    #[track_caller]
-    pub fn expect_pat(self) -> &'hir Pat<'hir> {
-        let Node::Pat(this) = self else { self.expect_failed("a pattern") };
-        this
-    }
-
-    /// Expect a [`Node::PatField`] or panic.
-    #[track_caller]
-    pub fn expect_pat_field(self) -> &'hir PatField<'hir> {
-        let Node::PatField(this) = self else { self.expect_failed("a pattern field") };
-        this
-    }
-
-    /// Expect a [`Node::Arm`] or panic.
-    #[track_caller]
-    pub fn expect_arm(self) -> &'hir Arm<'hir> {
-        let Node::Arm(this) = self else { self.expect_failed("an arm") };
-        this
-    }
-
-    /// Expect a [`Node::Block`] or panic.
-    #[track_caller]
-    pub fn expect_block(self) -> &'hir Block<'hir> {
-        let Node::Block(this) = self else { self.expect_failed("a block") };
-        this
-    }
-
-    /// Expect a [`Node::Local`] or panic.
-    #[track_caller]
-    pub fn expect_local(self) -> &'hir Local<'hir> {
-        let Node::Local(this) = self else { self.expect_failed("a local") };
-        this
-    }
-
-    /// Expect a [`Node::Ctor`] or panic.
-    #[track_caller]
-    pub fn expect_ctor(self) -> &'hir VariantData<'hir> {
-        let Node::Ctor(this) = self else { self.expect_failed("a constructor") };
-        this
-    }
-
-    /// Expect a [`Node::Lifetime`] or panic.
-    #[track_caller]
-    pub fn expect_lifetime(self) -> &'hir Lifetime {
-        let Node::Lifetime(this) = self else { self.expect_failed("a lifetime") };
-        this
-    }
-
-    /// Expect a [`Node::GenericParam`] or panic.
-    #[track_caller]
-    pub fn expect_generic_param(self) -> &'hir GenericParam<'hir> {
-        let Node::GenericParam(this) = self else { self.expect_failed("a generic parameter") };
-        this
-    }
-
-    /// Expect a [`Node::Crate`] or panic.
-    #[track_caller]
-    pub fn expect_crate(self) -> &'hir Mod<'hir> {
-        let Node::Crate(this) = self else { self.expect_failed("a crate") };
-        this
-    }
-
-    /// Expect a [`Node::Infer`] or panic.
-    #[track_caller]
-    pub fn expect_infer(self) -> &'hir InferArg {
-        let Node::Infer(this) = self else { self.expect_failed("an infer") };
-        this
-    }
-
-    #[track_caller]
-    fn expect_failed(&self, expected: &'static str) -> ! {
-        panic!("expected {expected} node, found {self:?}")
     }
 }