Fix warnings from upgrading GHC to 9.2.x.

Fix warnings, namely -Wstar-is-type.

Many -Wincomplete-uni-patterns warnings are not yet fixed.

Author: dan-zheng

makefile

@@ -118,7 +118,7 @@ ifneq (,$(DEX_CI))
 STACK_FLAGS := $(STACK_FLAGS) --flag dex:debug
 endif
 
-possible-clang-locations := clang++-9 clang++-10 clang++-11 clang++-12 clang++-15 clang++
+possible-clang-locations := clang++-15 clang++
 
 CLANG := clang++
 
@@ -133,11 +133,11 @@ CLANG := $(shell for clangversion in $(possible-clang-locations) ; do \
 if [[ $$(command -v "$$clangversion" 2>/dev/null) ]]; \
 then echo "$$clangversion" ; break ; fi ; done)
 ifeq (,$(CLANG))
-$(error "Please install clang++-12")
+$(error "Please install clang++-15")
 endif
-clang-version-compatible := $(shell $(CLANG) -dumpversion | awk '{ print(gsub(/^((9\.)|(10\.)|(11\.)|(12\.)|(15\.)).*$$/, "")) }')
+clang-version-compatible := $(shell $(CLANG) -dumpversion | awk '{ print(gsub(/^((15\.)).*$$/, "")) }')
 ifneq (1,$(clang-version-compatible))
-$(error "Please install clang++-12")
+$(error "Please install clang++-15")
 endif
 endif
 

src/lib/Builder.hs

@@ -14,6 +14,7 @@ import Control.Monad
 import Control.Monad.Reader
 import Control.Monad.Writer.Strict hiding (Alt)
 import Control.Monad.State.Strict (MonadState (..), StateT (..), runStateT)
+import qualified Data.Kind as K
 import qualified Data.Map.Strict as M
 import Data.Maybe (isJust)
 import Data.Graph (graphFromEdges, topSort)
@@ -136,7 +137,7 @@ liftTopBuilderAndEmit
 liftTopBuilderAndEmit cont = do
   liftTopBuilderHoisted cont >>= emitHoistedEnv
 
-newtype DoubleBuilderT (r::IR) (topEmissions::B) (m::MonadKind) (n::S) (a:: *) =
+newtype DoubleBuilderT (r::IR) (topEmissions::B) (m::MonadKind) (n::S) (a::K.Type) =
   DoubleBuilderT { runDoubleBuilderT' :: DoubleInplaceT Env topEmissions (BuilderEmissions r) m n a }
   deriving ( Functor, Applicative, Monad, MonadFail, Fallible
            , CtxReader, MonadIO, Catchable, MonadReader r')
@@ -343,7 +344,7 @@ lookupPtrName v = lookupEnv v >>= \case
 getCache :: EnvReader m => m n (Cache n)
 getCache = withEnv $ envCache . topEnv
 
-newtype TopBuilderT (m::MonadKind) (n::S) (a:: *) =
+newtype TopBuilderT (m::MonadKind) (n::S) (a::K.Type) =
   TopBuilderT { runTopBuilderT' :: InplaceT Env TopEnvFrag m n a }
   deriving ( Functor, Applicative, Monad, MonadFail, Fallible
            , CtxReader, ScopeReader, MonadTrans1, MonadReader r
@@ -418,7 +419,7 @@ instance (SinkableE e, HoistableState e, TopBuilder m) => TopBuilder (StateT1 e
 
 type BuilderEmissions r = RNest (Decl r)
 
-newtype BuilderT (r::IR) (m::MonadKind) (n::S) (a:: *) =
+newtype BuilderT (r::IR) (m::MonadKind) (n::S) (a::K.Type) =
   BuilderT { runBuilderT' :: InplaceT Env (BuilderEmissions r) m n a }
   deriving ( Functor, Applicative, Monad, MonadTrans1, MonadFail, Fallible
            , Catchable, CtxReader, ScopeReader, Alternative, Searcher

src/lib/CheapReduction.hs

@@ -23,7 +23,8 @@ import Control.Monad.State.Strict
 import Data.Foldable (toList)
 import Data.Functor.Identity
 import Data.Functor ((<&>))
-import qualified Data.List.NonEmpty    as NE
+import qualified Data.Kind as K
+import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as M
 import GHC.Exts (inline)
 
@@ -80,7 +81,7 @@ cheapNormalize a = cheapReduce a >>= \case
 
 -- === internal ===
 
-newtype CheapReducerM (r::IR) (i :: S) (o :: S) (a :: *) =
+newtype CheapReducerM (r::IR) (i :: S) (o :: S) (a :: K.Type) =
   CheapReducerM
     (SubstReaderT AtomSubstVal
       (MaybeT1

src/lib/CheckType.hs

@@ -17,6 +17,7 @@ import Control.Monad.Reader
 import Data.Maybe (isJust)
 import Data.Foldable (toList)
 import Data.Functor
+import qualified Data.Kind as K
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as M
 
@@ -61,7 +62,7 @@ class ( Monad2 m, Fallible2 m, SubstReader Name m
       , EnvReader2 m, EnvExtender2 m)
      => Typer (m::MonadKind2)
 
-newtype TyperT (m::MonadKind) (i::S) (o::S) (a :: *) =
+newtype TyperT (m::MonadKind) (i::S) (o::S) (a::K.Type) =
   TyperT { runTyperT' :: SubstReaderT Name (EnvReaderT m) i o a }
   deriving ( Functor, Applicative, Monad
            , SubstReader Name

src/lib/Core.hs

@@ -30,7 +30,8 @@ import Control.Monad.Reader
 import Control.Monad.Writer.Strict hiding (Alt)
 import Control.Monad.State
 import qualified Control.Monad.State.Strict as SS
-import qualified Data.Map.Strict       as M
+import qualified Data.Map.Strict as M
+import qualified Data.Kind as K
 
 import Name
 import Err
@@ -76,7 +77,7 @@ type EnvExtender2 (m::MonadKind2) = forall (n::S). EnvExtender (m n)
 
 -- === EnvReader monad ===
 
-newtype EnvReaderT (m::MonadKind) (n::S) (a:: *) =
+newtype EnvReaderT (m::MonadKind) (n::S) (a::K.Type) =
   EnvReaderT {runEnvReaderT' :: ReaderT (DistinctEvidence n, Env n) m a }
   deriving ( Functor, Applicative, Monad, MonadFail
            , MonadWriter w, Fallible, Searcher, Alternative)

src/lib/Err.hs

@@ -158,14 +158,12 @@ instance Functor Except where
   {-# INLINE fmap #-}
 
 instance Applicative Except where
-  pure = return
+  pure = Success
   {-# INLINE pure #-}
   liftA2 = liftM2
   {-# INLINE liftA2 #-}
 
 instance Monad Except where
-  return = Success
-  {-# INLINE return #-}
   Failure errs >>= _ = Failure errs
   Success x >>= f = f x
   {-# INLINE (>>=) #-}
@@ -211,8 +209,6 @@ instance Applicative HardFailM where
 instance Monad HardFailM where
   (HardFailM (Identity x)) >>= k = k x
   {-# INLINE (>>=) #-}
-  return = HardFailM . Identity
-  {-# INLINE return #-}
 
 runHardFail :: HardFailM a -> a
 runHardFail m = runIdentity $ runHardFail' m

src/lib/Export.hs

@@ -14,6 +14,7 @@ module Export (
 
 import Control.Category ((>>>))
 import Data.List (intercalate)
+import qualified Data.Kind as K
 import Foreign.Storable
 import Foreign.C.String
 import Foreign.Ptr
@@ -87,7 +88,7 @@ instance SinkableV (Rename r)
 instance FromName (Rename r) where
   fromName = JustRefer
 
-newtype ExportSigM (r::IR) (i::S) (o::S) (a:: *) = ExportSigM {
+newtype ExportSigM (r::IR) (i::S) (o::S) (a::K.Type) = ExportSigM {
   runExportSigM :: SubstReaderT (Rename r) (EnvReaderT FallibleM) i o a }
   deriving ( Functor, Applicative, Monad, ScopeReader, EnvExtender, Fallible
            , EnvReader, SubstReader (Rename r), MonadFail)

src/lib/Imp.hs

@@ -22,6 +22,7 @@ import Data.Functor
 import Data.Foldable (toList)
 import Data.Maybe (fromJust)
 import Data.Text.Prettyprint.Doc
+import qualified Data.Kind as K
 import Control.Category
 import Control.Monad.Identity
 import Control.Monad.Reader
@@ -171,12 +172,12 @@ instance ExtOutFrag ImpBuilderEmissions ImpDeclEmission where
   extendOutFrag ems (ImpDeclEmission d) = RNest ems d
   {-# INLINE extendOutFrag #-}
 
-newtype ImpM (n::S) (a:: *) =
+newtype ImpM (n::S) (a::K.Type) =
   ImpM { runImpM' :: WriterT1 (ListE IExpr)
                        (InplaceT Env ImpBuilderEmissions HardFailM) n a }
   deriving ( Functor, Applicative, Monad, ScopeReader, Fallible, MonadFail)
 
-type SubstImpM = SubstReaderT AtomSubstVal ImpM :: S -> S -> * -> *
+type SubstImpM = SubstReaderT AtomSubstVal ImpM :: S -> S -> K.Type -> K.Type
 
 instance ExtOutMap Env ImpBuilderEmissions where
   extendOutMap bindings emissions =

src/lib/Inference.hs

@@ -26,6 +26,7 @@ import Data.List (sortOn)
 import Data.Maybe (fromJust, fromMaybe, catMaybes)
 import Data.Text.Prettyprint.Doc (Pretty (..), (<+>), vcat)
 import Data.Word
+import qualified Data.Kind as K
 import qualified Data.HashMap.Strict as HM
 import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as M
@@ -396,7 +397,7 @@ extendOutMapWithConstraints env us ss (Constraints allCs) = case tryUnsnoc allCs
     let ss''' = SolverSubst $ ss'' <> s
     (env'', us'', ss''')
 
-newtype InfererM (i::S) (o::S) (a:: *) = InfererM
+newtype InfererM (i::S) (o::S) (a::K.Type) = InfererM
   { runInfererM' :: SubstReaderT Name (InplaceT InfOutMap InfOutFrag FallibleM) i o a }
   deriving (Functor, Applicative, Monad, MonadFail,
             ScopeReader, Fallible, Catchable, CtxReader, SubstReader Name)
@@ -2346,7 +2347,7 @@ instance ExtOutMap InfOutMap SolverOutFrag where
   extendOutMap infOutMap outFrag =
     extendOutMap infOutMap $ liftSolverOutFrag outFrag
 
-newtype SolverM (n::S) (a:: *) =
+newtype SolverM (n::S) (a::K.Type) =
   SolverM { runSolverM' :: InplaceT SolverOutMap SolverOutFrag SearcherM n a }
   deriving (Functor, Applicative, Monad, MonadFail, Alternative, Searcher,
             ScopeReader, Fallible, CtxReader)
@@ -2899,7 +2900,7 @@ class (Alternative1 m, Searcher1 m, EnvReader m, EnvExtender m)
   getGivens :: m n (Givens n)
   withGivens :: Givens n -> m n a -> m n a
 
-newtype SyntherM (n::S) (a:: *) = SyntherM
+newtype SyntherM (n::S) (a::K.Type) = SyntherM
   { runSyntherM' :: OutReaderT Givens (EnvReaderT []) n a }
   deriving ( Functor, Applicative, Monad, EnvReader, EnvExtender
            , ScopeReader, MonadFail

src/lib/Inline.hs

@@ -6,6 +6,7 @@
 
 module Inline (inlineBindings) where
 
+import qualified Data.Kind as K
 import Data.Functor
 import Data.List.NonEmpty qualified as NE
 
@@ -54,7 +55,7 @@ instance SinkableE (InlineExpr r) where
 
 type InlineSubstVal = SubstVal InlineExpr
 
-newtype InlineM (i::S) (o::S) (a:: *) = InlineM
+newtype InlineM (i::S) (o::S) (a::K.Type) = InlineM
   { runInlineM :: SubstReaderT InlineSubstVal (BuilderM SimpIR) i o a }
   deriving ( Functor, Applicative, Monad, MonadFail, Fallible, ScopeReader
            , EnvExtender, EnvReader, SubstReader InlineSubstVal, (Builder SimpIR)