Satisfy -Wstar-is-type

Author: philderbeast

hackage-security/src/Hackage/Security/Client/Formats.hs

@@ -18,6 +18,7 @@ module Hackage.Security.Client.Formats (
   ) where
 
 import Prelude
+import Data.Kind (Type)
 import Hackage.Security.Util.Stack
 import Hackage.Security.Util.TypedEmbedded
 
@@ -31,7 +32,7 @@ data FormatGz
 -- | Format is a singleton type (reflection type to term level)
 --
 -- NOTE: In the future we might add further compression formats.
-data Format :: * -> * where
+data Format :: Type -> Type where
   FUn :: Format FormatUn
   FGz :: Format FormatGz
 
@@ -55,7 +56,7 @@ instance Unify Format where
 --
 -- NOTE: If we add additional cases here (for dealing with additional formats)
 -- all calls to @error "inaccessible"@ need to be reevaluated.
-data Formats :: * -> * -> * where
+data Formats :: Type -> Type -> Type where
   FsNone :: Formats () a
   FsUn   :: a -> Formats (FormatUn :- ()) a
   FsGz   :: a -> Formats (FormatGz :- ()) a
@@ -74,7 +75,7 @@ instance Functor (Formats fs) where
 -- | @HasFormat fs f@ is a proof that @f@ is a key in @fs@.
 --
 -- See 'formatsMember' and 'formatsLookup' for typical usage.
-data HasFormat :: * -> * -> * where
+data HasFormat :: Type -> Type -> Type where
   HFZ :: Format f       -> HasFormat (f  :- fs) f
   HFS :: HasFormat fs f -> HasFormat (f' :- fs) f
 

hackage-security/src/Hackage/Security/Client/Repository.hs

@@ -32,6 +32,7 @@ module Hackage.Security.Client.Repository (
 
 import Prelude
 import Control.Exception
+import Data.Kind (Type)
 import Data.Typeable (Typeable)
 import qualified Codec.Archive.Tar.Index as Tar
 import qualified Data.ByteString.Lazy    as BS.L
@@ -63,7 +64,7 @@ data Binary
 -- is metadata actual binary content.
 --
 -- NOTE: Haddock lacks GADT support so constructors have only regular comments.
-data RemoteFile :: * -> * -> * where
+data RemoteFile :: Type -> Type -> Type where
     -- Timestamp metadata (@timestamp.json@)
     --
     -- We never have (explicit) file length available for timestamps.
@@ -361,7 +362,7 @@ data UpdateFailure =
   Downloaded files
 -------------------------------------------------------------------------------}
 
-class DownloadedFile (down :: * -> *) where
+class DownloadedFile (down :: Type -> Type) where
   -- | Verify a download file
   downloadedVerify :: down a -> Trusted FileInfo -> IO Bool
 
@@ -381,7 +382,7 @@ class DownloadedFile (down :: * -> *) where
 --
 -- For instance, for repositories using HTTP this might correspond to a 404;
 -- for local repositories this might correspond to file-not-found, etc.
-data SomeRemoteError :: * where
+data SomeRemoteError :: Type where
     SomeRemoteError :: Exception e => e -> SomeRemoteError
   deriving (Typeable)
 
@@ -419,7 +420,7 @@ remoteRepoPath' repoLayout file format =
 -------------------------------------------------------------------------------}
 
 -- | Is a particular remote file cached?
-data IsCached :: * -> * where
+data IsCached :: Type -> Type where
     -- This remote file should be cached, and we ask for it by name
     CacheAs :: CachedFile -> IsCached Metadata
 

hackage-security/src/Hackage/Security/Client/Repository/Remote.hs

@@ -32,6 +32,7 @@ import Control.Concurrent
 import Control.Exception
 import Control.Monad (when, unless)
 import Control.Monad.IO.Class (MonadIO)
+import Data.Kind (Type)
 import Data.List (nub, intercalate)
 import Data.Typeable
 import Network.URI hiding (uriPath, path)
@@ -300,7 +301,7 @@ withMirror HttpLib{}
 -------------------------------------------------------------------------------}
 
 -- | Download method (downloading or updating)
-data DownloadMethod :: * -> * -> * where
+data DownloadMethod :: Type -> Type -> Type where
     -- Download this file (we never attempt to update this type of file)
     NeverUpdated :: {
         neverUpdatedFormat :: HasFormat fs f
@@ -595,7 +596,7 @@ fileLength' = fileLength . fileInfoLength . trusted
   Files downloaded from the remote repository
 -------------------------------------------------------------------------------}
 
-data RemoteTemp :: * -> * where
+data RemoteTemp :: Type -> Type where
     DownloadedWhole :: {
         wholeTemp :: Path Absolute
       } -> RemoteTemp a

hackage-security/src/Hackage/Security/TUF/Layout/Index.hs

@@ -10,6 +10,7 @@ module Hackage.Security.TUF.Layout.Index (
   ) where
 
 import Prelude
+import Data.Kind (Type)
 import Distribution.Package
 import Distribution.Text
 
@@ -43,7 +44,7 @@ data IndexLayout = IndexLayout  {
 -- TODO: If we wanted to support legacy Hackage, we should also have a case for
 -- the global preferred-versions file. But supporting legacy Hackage will
 -- probably require more work anyway..
-data IndexFile :: * -> * where
+data IndexFile :: Type -> Type where
     -- Package-specific metadata (@targets.json@)
     IndexPkgMetadata :: PackageIdentifier -> IndexFile (Signed Targets)
 

hackage-security/src/Hackage/Security/Util/TypedEmbedded.hs

@@ -8,6 +8,7 @@ module Hackage.Security.Util.TypedEmbedded (
   ) where
 
 import Prelude
+import Data.Kind (Type)
 
 -- | Type equality proofs
 --
@@ -16,7 +17,7 @@ import Prelude
 data a :=: b where
   Refl :: a :=: a
 
-type family TypeOf (f :: * -> *) :: * -> *
+type family TypeOf (f :: Type -> Type) :: Type -> Type
 
 -- | Equality check that gives us a type-level equality proof.
 class Unify f where

hackage-security/tests/TestSuite/InMemRepo.hs

@@ -8,6 +8,7 @@ module TestSuite.InMemRepo (
 
 -- stdlib
 import Control.Exception
+import Data.Kind (Type)
 import Data.Time
 import qualified Codec.Archive.Tar      as Tar
 import qualified Codec.Compression.GZip as GZip
@@ -33,7 +34,7 @@ import TestSuite.Util.StrictMVar
   "Files" from the in-memory repository
 -------------------------------------------------------------------------------}
 
-data InMemFile :: * -> * where
+data InMemFile :: Type -> Type where
     InMemMetadata :: ToJSON WriteJSON a => RepoLayout -> a -> InMemFile Metadata
     InMemBinary   :: BS.L.ByteString -> InMemFile Binary