Implement 'deepErrorX' in terms of 'spinify'

clash-prelude/src/Clash/XException.hs

@@ -623,8 +623,8 @@ class NFDataX a where
   -- is defined.
   deepErrorX :: HasCallStack => String -> a
 
-  default deepErrorX :: (HasCallStack, Generic a, GDeepErrorX (Rep a)) => String -> a
-  deepErrorX = withFrozenCallStack $ to . gDeepErrorX
+  default deepErrorX :: (HasCallStack, Generic a, GEnsureSpine (Rep a)) => String -> a
+  deepErrorX = withFrozenCallStack $ to . gEnsureSpine . errorX
 
   -- | Determines whether any of parts of a given construct contain undefined
   -- parts. Note that a negative answer does not mean its bit representation
@@ -852,24 +852,3 @@ instance NFDataX a => NFDataX (SG.Min a)
 instance NFDataX a => NFDataX (SG.Option a)
 instance NFDataX a => NFDataX (SG.Product a)
 instance NFDataX a => NFDataX (SG.Sum a)
-
-class GDeepErrorX f where
-  gDeepErrorX :: HasCallStack => String -> f a
-
-instance GDeepErrorX V1 where
-  gDeepErrorX = errorX
-
-instance GDeepErrorX U1 where
-  gDeepErrorX = const U1
-
-instance (GDeepErrorX a) => GDeepErrorX (M1 m d a) where
-  gDeepErrorX e = M1 (gDeepErrorX e)
-
-instance (GDeepErrorX f, GDeepErrorX g) => GDeepErrorX (f :*: g) where
-  gDeepErrorX e = gDeepErrorX e :*: gDeepErrorX e
-
-instance NFDataX c => GDeepErrorX (K1 i c) where
-  gDeepErrorX e = K1 (deepErrorX e)
-
-instance GDeepErrorX (f :+: g) where
-  gDeepErrorX = errorX