stash

Author: lcnr

compiler/rustc_type_ir/src/macros.rs

@@ -3,32 +3,8 @@
 macro_rules! TrivialTypeTraversalImpls {
     ($($ty:ty,)+) => {
         $(
-            impl<I: $crate::Interner> $crate::fold::TypeFoldable<I> for $ty {
-                fn try_fold_with<F: $crate::fold::FallibleTypeFolder<I>>(
-                    self,
-                    _: &mut F,
-                ) -> ::std::result::Result<Self, F::Error> {
-                    Ok(self)
-                }
-
-                #[inline]
-                fn fold_with<F: $crate::fold::TypeFolder<I>>(
-                    self,
-                    _: &mut F,
-                ) -> Self {
-                    self
-                }
-            }
-
-            impl<I: $crate::Interner> $crate::visit::TypeVisitable<I> for $ty {
-                #[inline]
-                fn visit_with<F: $crate::visit::TypeVisitor<I>>(
-                    &self,
-                    _: &mut F)
-                    -> F::Result
-                {
-                    <F::Result as rustc_ast_ir::visit::VisitorResult>::output()
-                }
+            impl<I: $crate::Interner> $crate::traverse::TypeTraversable<I> for $ty {
+                type Kind = $crate::traverse::NoopTypeTraversal;
             }
         )+
     };

compiler/rustc_type_ir/src/traverse/mod.rs

@@ -40,17 +40,8 @@ pub trait TypeTraversable<I: Interner>: fmt::Debug + Clone {
 }
 pub struct ImportantTypeTraversal;
 pub struct NoopTypeTraversal;
-#[inline(always)]
-pub fn noop_visit<I, V, T>() -> V::Result
-where
-    I: Interner,
-    V: TypeVisitor<I>,
-    T: TypeTraversable<I, Kind = NoopTypeTraversal>,
-{
-    V::Result::output()
-}
 
-impl<I: Interner, T: TypeVisitable<I>> TypeTraversable<I> for T {
+impl<I: Interner, T: TypeVisitable> TypeTraversable<I> for T {
     type Kind = ImportantTypeTraversal;
 }
 

compiler/rustc_type_ir/src/ty_kind.rs

@@ -8,7 +8,9 @@ use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_data_structures::unify::{NoError, UnifyKey, UnifyValue};
 #[cfg(feature = "nightly")]
 use rustc_macros::{Decodable, Encodable, HashStable_NoContext, TyDecodable, TyEncodable};
-use rustc_type_ir_macros::{Lift_Generic, TypeFoldable_Generic, TypeVisitable_Generic};
+use rustc_type_ir_macros::{
+    Lift_Generic, NoopTypeTraversable_Generic, TypeFoldable_Generic, TypeVisitable_Generic,
+};
 
 use self::TyKind::*;
 pub use self::closure::*;
@@ -1012,7 +1014,7 @@ impl<I: Interner> ty::Binder<I, FnSigTys<I>> {
 
 #[derive_where(Clone, Copy, Debug, PartialEq, Eq, Hash; I: Interner)]
 #[cfg_attr(feature = "nightly", derive(TyEncodable, TyDecodable, HashStable_NoContext))]
-#[derive(TypeVisitable_Generic, TypeFoldable_Generic, Lift_Generic)]
+#[derive(NoopTypeTraversable_Generic, Lift_Generic)]
 pub struct FnHeader<I: Interner> {
     pub c_variadic: bool,
     pub safety: I::Safety,