Naming convention fixes + Classes for tuples up to n=5

- `Consumable`, `Dupable` and `Movable` uniformly implemented for tuples up to n=5 - Fix some names/imports according to the project conventions
tweag · Mar 14, 2022 · 941b83f · 941b83f
1 parent 29926db
commit 941b83f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/linear-base.cabal b/linear-base.cabal
@@ -125,7 +125,7 @@ library
         containers,
         ghc-prim,
         hashable,
-        linear-generics >= 0.2 && < 0.3,
+        linear-generics >= 0.2,
         storable-tuple,
         text,
         transformers,

diff --git a/src/Control/Functor/Linear/Internal/Class.hs b/src/Control/Functor/Linear/Internal/Class.hs
@@ -9,7 +9,6 @@
 {-# LANGUAGE RebindableSyntax #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
@@ -43,12 +42,12 @@ module Control.Functor.Linear.Internal.Class
 where
 
 import qualified Control.Monad as NonLinear ()
-import Data.Functor.Compose (Compose (..))
-import Data.Functor.Identity (Identity (..))
+import Data.Functor.Compose
+import Data.Functor.Identity
 import qualified Data.Functor.Linear.Internal.Applicative as Data
 import qualified Data.Functor.Linear.Internal.Functor as Data
-import qualified Data.Functor.Sum
-import Data.Monoid.Linear
+import Data.Functor.Sum
+import Data.Monoid.Linear hiding (Sum)
 import Data.Type.Bool
 import Data.Unrestricted.Linear.Internal.Consumable
 import GHC.TypeLits
@@ -242,9 +241,9 @@ instance Monoid a => Monad ((,) a) where
       go b1 (b2, y) = (b1 <> b2, y)
 
 deriving via
-  Generically1 (Data.Functor.Sum.Sum f g)
+  Generically1 (Sum f g)
   instance
-    (Functor f, Functor g) => Functor (Data.Functor.Sum.Sum f g)
+    (Functor f, Functor g) => Functor (Sum f g)
 
 deriving via
   Generically1 (Compose f g)

diff --git a/src/Data/Unrestricted/Linear/Internal/Consumable.hs b/src/Data/Unrestricted/Linear/Internal/Consumable.hs
@@ -140,11 +140,6 @@ deriving via
   instance
     _ => Consumable (a, b, c, d, e)
 
-deriving via
-  Generically (a, b, c, d, e, f)
-  instance
-    _ => Consumable (a, b, c, d, e, f)
-
 deriving via
   Generically (Prelude.Maybe a)
   instance

diff --git a/src/Data/Unrestricted/Linear/Internal/Dupable.hs b/src/Data/Unrestricted/Linear/Internal/Dupable.hs
@@ -18,7 +18,7 @@
 
 module Data.Unrestricted.Linear.Internal.Dupable
   ( Dupable (..),
-    genericdupR,
+    genericDupR,
     dup,
     dup3,
     dup4,
@@ -232,8 +232,8 @@ deriving newtype instance Dupable Semigroup.Any
 instance (Generic a, GDupable (Rep a)) => Dupable (Generically a) where
   dupR (Generically x) = lcoerce (Replicator.map (to :: Rep a x %1 -> a) (gdupR (from x)))
 
-genericdupR :: (Generic a, GDupable (Rep a)) => a %1 -> Replicator a
-genericdupR x = Replicator.map to (gdupR (from x))
+genericDupR :: (Generic a, GDupable (Rep a)) => a %1 -> Replicator a
+genericDupR x = Replicator.map to (gdupR (from x))
 
 class GConsumable f => GDupable f where
   gdupR :: f a %1 -> Replicator (f a)

diff --git a/src/Data/Unrestricted/Linear/Internal/Movable.hs b/src/Data/Unrestricted/Linear/Internal/Movable.hs
@@ -6,7 +6,6 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE LinearTypes #-}
-{-# LANGUAGE MagicHash #-}
 {-# LANGUAGE QuantifiedConstraints #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
@@ -118,6 +117,11 @@ deriving via
   instance
     (Movable a, Movable b, Movable c, Movable d) => Movable (a, b, c, d)
 
+deriving via
+  Generically (a, b, c, d, e)
+  instance
+    (Movable a, Movable b, Movable c, Movable d, Movable e) => Movable (a, b, c, d, e)
+
 instance Movable a => Movable (Prelude.Maybe a) where
   move (Prelude.Nothing) = Ur Prelude.Nothing
   move (Prelude.Just x) = Data.fmap Prelude.Just (move x)