Prefer newtype deriving over Generic deriving for simplicity

1 files changed, 2 insertions, 11 deletions

diff --git a/src/Data/Array/Nested/Ranked/Shape.hs b/src/Data/Array/Nested/Ranked/Shape.hs
index b6bee2e..36f49dc 100644
--- a/src/Data/Array/Nested/Ranked/Shape.hs
+++ b/src/Data/Array/Nested/Ranked/Shape.hs
@@ -1,8 +1,6 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
@@ -37,7 +35,6 @@ import Data.Kind (Type)
 import Data.Proxy
 import Data.Type.Equality
 import GHC.Exts (Int(..), Int#, build, quotRemInt#)
-import GHC.Generics (Generic)
 import GHC.IsList (IsList)
 import GHC.IsList qualified as IsList
 import GHC.TypeLits
@@ -216,8 +213,7 @@ listrPermutePrefix = \perm sh ->
 type role IxR nominal representational
 type IxR :: Nat -> Type -> Type
 newtype IxR n i = IxR (ListR n i)
-  deriving (Eq, Ord, Generic)
-  deriving newtype (Functor, Foldable)
+  deriving (Eq, Ord, NFData, Functor, Foldable)
 
 pattern ZIR :: forall n i. () => n ~ 0 => IxR n i
 pattern ZIR = IxR ZR
@@ -243,8 +239,6 @@ instance Show i => Show (IxR n i) where
   showsPrec _ (IxR l) = listrShow shows l
 #endif
 
-instance NFData i => NFData (IxR sh i)
-
 ixrLength :: IxR sh i -> Int
 ixrLength (IxR l) = listrLength l
 
@@ -310,8 +304,7 @@ ixrToLinear = \sh i -> go sh i 0
 type role ShR nominal representational
 type ShR :: Nat -> Type -> Type
 newtype ShR n i = ShR (ListR n i)
-  deriving (Eq, Ord, Generic)
-  deriving newtype (Functor, Foldable)
+  deriving (Eq, Ord, NFData, Functor, Foldable)
 
 pattern ZSR :: forall n i. () => n ~ 0 => ShR n i
 pattern ZSR = ShR ZR
@@ -335,8 +328,6 @@ instance Show i => Show (ShR n i) where
   showsPrec _ (ShR l) = listrShow shows l
 #endif
 
-instance NFData i => NFData (ShR sh i)
-
 -- | This checks only whether the ranks are equal, not whether the actual
 -- values are.
 shrEqRank :: ShR n i -> ShR n' i -> Maybe (n :~: n')