Upgrade to GHC 9.6.4

Author: zachjs

src/Convert/AlwaysKW.hs

@@ -12,9 +12,11 @@
 
 module Convert.AlwaysKW (convert) where
 
+import Control.Monad (when, zipWithM, (>=>))
 import Control.Monad.State.Strict
 import Control.Monad.Writer.Strict
 import Data.Maybe (fromMaybe, mapMaybe)
+import Data.Monoid (Any(Any), getAny)
 
 import Convert.Scoper
 import Convert.Traverse

src/Convert/Cast.hs

@@ -27,9 +27,11 @@
 
 module Convert.Cast (convert) where
 
+import Control.Monad (when)
 import Control.Monad.Writer.Strict
 import Data.List (isPrefixOf)
 import Data.Maybe (isJust)
+import Data.Monoid (Any(Any), getAny)
 
 import Convert.ExprUtils
 import Convert.Scoper

src/Convert/GenvarName.hs

@@ -7,6 +7,7 @@
 
 module Convert.GenvarName (convert) where
 
+import Control.Monad (when)
 import Control.Monad.State.Strict
 import Control.Monad.Writer.Strict
 import Data.Functor ((<&>))

src/Convert/Inside.hs

@@ -21,6 +21,7 @@ import Language.SystemVerilog.AST
 
 import Control.Monad.Writer
 import Data.Maybe (fromMaybe)
+import Data.Monoid (Any(Any), getAny)
 
 convert :: [AST] -> [AST]
 convert = map $ traverseDescriptions $ traverseModuleItems convertModuleItem

src/Convert/Interface.hs

@@ -8,6 +8,8 @@ module Convert.Interface (convert, disambiguate) where
 
 import Data.List (intercalate, (\\))
 import Data.Maybe (isJust, isNothing, mapMaybe)
+import Data.Monoid (Any(Any), getAny)
+import Control.Monad (when, (>=>))
 import Control.Monad.Writer.Strict
 import Text.Read (readMaybe)
 import qualified Data.Map.Strict as Map

src/Convert/Jump.hs

@@ -11,6 +11,7 @@ module Convert.Jump (convert) where
 
 import Control.Monad.State.Strict
 import Control.Monad.Writer.Strict
+import Data.Monoid (Any(Any), getAny)
 
 import Convert.Traverse
 import Language.SystemVerilog.AST

src/Convert/Logic.hs

@@ -25,6 +25,7 @@
 
 module Convert.Logic (convert) where
 
+import Control.Monad (when)
 import Control.Monad.Writer.Strict
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set

src/Convert/Package.hs

@@ -23,6 +23,7 @@ module Convert.Package
     , prefixItems
     ) where
 
+import Control.Monad (when, (>=>))
 import Control.Monad.State.Strict
 import Control.Monad.Writer.Strict
 import Data.Functor ((<&>))

src/Convert/ParamNoDefault.hs

@@ -14,6 +14,7 @@
 
 module Convert.ParamNoDefault (convert) where
 
+import Control.Monad (when)
 import Control.Monad.Writer.Strict
 import Data.List (intercalate)
 import qualified Data.Map.Strict as Map

src/Convert/ParamType.hs

@@ -10,6 +10,7 @@ import Control.Monad.Writer.Strict
 import Data.Either (isRight, lefts)
 import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
+import Data.Monoid (Any(Any), getAny)
 
 import Convert.Traverse
 import Language.SystemVerilog.AST