Get rid of #ifdef for Semigroup & Monoid imports.

ucsd-progsys · May 20, 2022 · 6afc5bd · 6afc5bd
1 parent eaae956
commit 6afc5bd
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 78 deletions.
diff --git a/src/Language/Fixpoint/Graph/Deps.hs b/src/Language/Fixpoint/Graph/Deps.hs
@@ -28,10 +28,6 @@ module Language.Fixpoint.Graph.Deps (
 
 import           Prelude hiding (init)
 import           Data.Maybe                       (mapMaybe, fromMaybe)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup                   (Semigroup (..))
-#endif
-
 import           Data.Tree (flatten)
 import           Language.Fixpoint.Misc
 import           Language.Fixpoint.Utils.Files

diff --git a/src/Language/Fixpoint/Graph/Partition.hs b/src/Language/Fixpoint/Graph/Partition.hs
@@ -39,10 +39,6 @@ import qualified Data.HashMap.Strict                  as M
 -- import           Data.Function (on)
 import           Data.Maybe                     (fromMaybe)
 import           Data.Hashable
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup                 (Semigroup (..))
-#endif
-
 import           Text.PrettyPrint.HughesPJ.Compat
 import           Data.List (sortBy)
 -- import qualified Data.HashSet              as S

diff --git a/src/Language/Fixpoint/Smt/Interface.hs b/src/Language/Fixpoint/Smt/Interface.hs
@@ -106,10 +106,6 @@ import           Control.Exception
 import           Data.Char
 import qualified Data.HashMap.Strict      as M
 import           Data.Maybe              (fromMaybe)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup          (Semigroup (..))
-#endif
-
 import qualified Data.Text                as T
 -- import           Data.Text.Format
 import qualified Data.Text.IO             as TIO

diff --git a/src/Language/Fixpoint/Smt/Serialize.hs b/src/Language/Fixpoint/Smt/Serialize.hs
@@ -17,9 +17,6 @@ import           Language.Fixpoint.Types
 import qualified Language.Fixpoint.Types.Visitor as Vis
 import           Language.Fixpoint.Smt.Types
 import qualified Language.Fixpoint.Smt.Theories as Thy
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup                 (Semigroup (..))
-#endif
 
 -- import           Data.Text.Format
 import           Language.Fixpoint.Misc (sortNub, errorstar)

diff --git a/src/Language/Fixpoint/Smt/Theories.hs b/src/Language/Fixpoint/Smt/Theories.hs
@@ -38,10 +38,6 @@ module Language.Fixpoint.Smt.Theories
      ) where
 
 import           Prelude hiding (map)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import           Language.Fixpoint.Types.Sorts
 import           Language.Fixpoint.Types.Config
 import           Language.Fixpoint.Types

diff --git a/src/Language/Fixpoint/Solver/GradualSolution.hs b/src/Language/Fixpoint/Solver/GradualSolution.hs
@@ -11,9 +11,6 @@ import           Control.Parallel.Strategies
 import qualified Data.HashMap.Strict            as M
 import qualified Data.List                      as L
 import           Data.Maybe                     (maybeToList, isNothing)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Monoid                    ((<>))
-#endif
 import           Language.Fixpoint.Types.Config
 import           Language.Fixpoint.Types.PrettyPrint ()
 import qualified Language.Fixpoint.SortCheck          as So

diff --git a/src/Language/Fixpoint/Solver/Solution.hs b/src/Language/Fixpoint/Solver/Solution.hs
@@ -23,10 +23,6 @@ import qualified Data.HashSet                   as S
 import qualified Data.HashMap.Strict            as M
 import qualified Data.List                      as L
 import           Data.Maybe                     (fromMaybe, maybeToList, isNothing)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup                 (Semigroup (..))
-#endif
-
 import           Language.Fixpoint.Types.PrettyPrint ()
 import           Language.Fixpoint.Types.Visitor      as V
 import qualified Language.Fixpoint.SortCheck          as So

diff --git a/src/Language/Fixpoint/Solver/Stats.hs b/src/Language/Fixpoint/Solver/Stats.hs
@@ -14,10 +14,6 @@ import qualified Data.Store              as S
 import qualified Language.Fixpoint.Types.PrettyPrint as F
 import Data.Aeson
 
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 data Stats = Stats
   { numCstr      :: !Int -- ^ # Horn Constraints
   , numIter      :: !Int -- ^ # Refine Iterations

diff --git a/src/Language/Fixpoint/SortCheck.hs b/src/Language/Fixpoint/SortCheck.hs
@@ -68,10 +68,6 @@ import qualified Data.HashMap.Strict       as M
 import           Data.IORef
 import qualified Data.List                 as L
 import           Data.Maybe                (mapMaybe, fromMaybe, catMaybes, isJust)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 
 import           Language.Fixpoint.Types.PrettyPrint
 import           Language.Fixpoint.Misc

diff --git a/src/Language/Fixpoint/Types/Constraints.hs b/src/Language/Fixpoint/Types/Constraints.hs
@@ -90,10 +90,6 @@ module Language.Fixpoint.Types.Constraints (
 import qualified Data.Store as S
 import           Data.Generics             (Data)
 import           Data.Aeson                hiding (Result)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import qualified Data.Set                  as Set
 import           Data.Typeable             (Typeable)
 import           Data.Hashable

diff --git a/src/Language/Fixpoint/Types/Environments.hs b/src/Language/Fixpoint/Types/Environments.hs
@@ -62,10 +62,6 @@ module Language.Fixpoint.Types.Environments (
 import qualified Data.Store as S
 import qualified Data.List   as L
 import           Data.Generics             (Data)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import           Data.Typeable             (Typeable)
 import           GHC.Generics              (Generic)
 import qualified Data.HashMap.Strict       as M

diff --git a/src/Language/Fixpoint/Types/Errors.hs b/src/Language/Fixpoint/Types/Errors.hs
@@ -58,10 +58,6 @@ import           Data.Serialize                (Serialize (..))
 import           Data.Aeson                    hiding (Error, Result)
 import           Data.Generics                 (Data)
 import           Data.Typeable
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup                (Semigroup (..))
-#endif
-
 import           Control.DeepSeq
 -- import           Data.Hashable
 import qualified Data.Store                   as S

diff --git a/src/Language/Fixpoint/Types/Graduals.hs b/src/Language/Fixpoint/Types/Graduals.hs
@@ -40,10 +40,6 @@ import qualified Data.List                 as L
 
 import Control.Monad.State.Lazy
 import Data.Maybe (fromMaybe)
-#if !MIN_VERSION_base(4,14,0)
-import Data.Semigroup (Semigroup (..))
-#endif
-
 import qualified Language.Fixpoint.SortCheck       as So
 import Language.Fixpoint.Solver.Sanitize (symbolEnv)
 

diff --git a/src/Language/Fixpoint/Types/Names.hs b/src/Language/Fixpoint/Types/Names.hs
@@ -129,9 +129,6 @@ import           Control.DeepSeq             (NFData (..))
 import           Control.Arrow               (second)
 import           Data.Char                   (ord)
 import           Data.Maybe                  (fromMaybe)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Monoid                 ((<>))
-#endif
 import           Data.Generics               (Data)
 import           Data.Hashable               (Hashable (..))
 import qualified Data.HashSet                as S hiding (size)

diff --git a/src/Language/Fixpoint/Types/PrettyPrint.hs b/src/Language/Fixpoint/Types/PrettyPrint.hs
@@ -13,10 +13,6 @@ import qualified Data.HashSet        as S
 import qualified Data.List           as L
 import           Language.Fixpoint.Misc
 import           Data.Hashable
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup (Semigroup (..))
-#endif
-
 import qualified Data.Text as T
 
 traceFix     ::  (Fixpoint a) => String -> a -> a

diff --git a/src/Language/Fixpoint/Types/Solutions.hs b/src/Language/Fixpoint/Types/Solutions.hs
@@ -79,10 +79,6 @@ import qualified Data.Maybe                 as Mb
 import qualified Data.HashMap.Strict        as M
 import qualified Data.List                  as L
 import           Data.Generics             (Data)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import           Data.Typeable             (Typeable)
 import           Control.Monad (filterM)
 import           Language.Fixpoint.Misc

diff --git a/src/Language/Fixpoint/Types/Sorts.hs b/src/Language/Fixpoint/Types/Sorts.hs
@@ -85,11 +85,6 @@ import qualified Data.Store as S
 import           Data.Generics             (Data)
 import           Data.Typeable             (Typeable)
 import           GHC.Generics              (Generic)
-
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import           Data.Hashable
 import           Data.HashSet (HashSet)
 import qualified Data.HashSet as HashSet

diff --git a/src/Language/Fixpoint/Types/Substitutions.hs b/src/Language/Fixpoint/Types/Substitutions.hs
@@ -20,10 +20,6 @@ module Language.Fixpoint.Types.Substitutions (
 import           Data.Maybe
 import qualified Data.HashMap.Strict       as M
 import qualified Data.HashSet              as S
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import           Language.Fixpoint.Types.PrettyPrint
 import           Language.Fixpoint.Types.Names
 import           Language.Fixpoint.Types.Sorts

diff --git a/src/Language/Fixpoint/Types/Theories.hs b/src/Language/Fixpoint/Types/Theories.hs
@@ -35,10 +35,6 @@ module Language.Fixpoint.Types.Theories (
 
 
 import           Data.Generics             (Data)
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup            (Semigroup (..))
-#endif
-
 import           Data.Typeable             (Typeable)
 import           Data.Hashable
 import           GHC.Generics              (Generic)

diff --git a/src/Language/Fixpoint/Types/Visitor.hs b/src/Language/Fixpoint/Types/Visitor.hs
@@ -51,10 +51,6 @@ module Language.Fixpoint.Types.Visitor (
 
 -- import           Control.Monad.Trans.State.Strict (State, modify, runState)
 -- import           Control.DeepSeq
-#if !MIN_VERSION_base(4,14,0)
-import           Data.Semigroup      (Semigroup (..))
-#endif
-
 import           Control.Monad.State.Strict
 import qualified Data.HashSet        as S
 import qualified Data.HashMap.Strict as M