From 6678683eb8c771413fdf489c837016b8a8fa7c7e Mon Sep 17 00:00:00 2001
From: Brian Huffman <huffman@galois.com>
Date: Thu, 23 Apr 2020 20:26:28 -0700
Subject: [PATCH] Make code compile without warnings in ghc-8.6 and ghc-8.8.

---
 what4/src/What4/Config.hs                  | 1 -
 what4/src/What4/LabeledPred.hs             | 2 +-
 what4/src/What4/Protocol/SMTLib2/Parse.hs  | 1 -
 what4/src/What4/Protocol/SMTLib2/Syntax.hs | 1 -
 what4/src/What4/Protocol/SMTWriter.hs      | 3 +--
 what4/src/What4/Solver/Yices.hs            | 1 -
 what4/src/What4/Utils/HandleReader.hs      | 1 -
 7 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/what4/src/What4/Config.hs b/what4/src/What4/Config.hs
index 1160afe5..e8e30747 100644
--- a/what4/src/What4/Config.hs
+++ b/what4/src/What4/Config.hs
@@ -166,7 +166,6 @@ import           Data.List.NonEmpty (NonEmpty(..))
 import           Data.Parameterized.Some
 import           Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
-import           Data.Semigroup (Semigroup(..))
 import           Data.Set (Set)
 import qualified Data.Set as Set
 import           Data.Map (Map)
diff --git a/what4/src/What4/LabeledPred.hs b/what4/src/What4/LabeledPred.hs
index 4f448627..99509b81 100644
--- a/what4/src/What4/LabeledPred.hs
+++ b/what4/src/What4/LabeledPred.hs
@@ -32,7 +32,7 @@ import Data.Data (Data)
 import Data.Coerce (coerce)
 import Data.Data (Typeable)
 import Data.Eq.Deriving (deriveEq1, deriveEq2)
-import Data.Foldable (Foldable, foldrM)
+import Data.Foldable (foldrM)
 import Data.Ord.Deriving (deriveOrd1, deriveOrd2)
 import GHC.Generics (Generic, Generic1)
 import Text.Show.Deriving (deriveShow1, deriveShow2)
diff --git a/what4/src/What4/Protocol/SMTLib2/Parse.hs b/what4/src/What4/Protocol/SMTLib2/Parse.hs
index 5494b2f3..a27d26a5 100644
--- a/what4/src/What4/Protocol/SMTLib2/Parse.hs
+++ b/what4/src/What4/Protocol/SMTLib2/Parse.hs
@@ -45,7 +45,6 @@ import qualified Data.ByteString.UTF8 as UTF8
 import           Data.Char
 import           Data.HashSet (HashSet)
 import qualified Data.HashSet as HSet
-import           Data.Monoid ((<>))
 import           Data.Ratio
 import           Data.String
 import           Data.Word
diff --git a/what4/src/What4/Protocol/SMTLib2/Syntax.hs b/what4/src/What4/Protocol/SMTLib2/Syntax.hs
index 6f1e1d44..b19fb5e6 100644
--- a/what4/src/What4/Protocol/SMTLib2/Syntax.hs
+++ b/what4/src/What4/Protocol/SMTLib2/Syntax.hs
@@ -139,7 +139,6 @@ module What4.Protocol.SMTLib2.Syntax
 
 import           Data.Bits hiding (xor)
 import           Data.Char (intToDigit)
-import           Data.Monoid ((<>))
 import           Data.String
 import           Data.Text (Text, cons)
 import           Data.Text.Lazy.Builder (Builder)
diff --git a/what4/src/What4/Protocol/SMTWriter.hs b/what4/src/What4/Protocol/SMTWriter.hs
index 4d1cac75..0c222104 100644
--- a/what4/src/What4/Protocol/SMTWriter.hs
+++ b/what4/src/What4/Protocol/SMTWriter.hs
@@ -115,7 +115,6 @@ import           Data.Parameterized.Nonce (Nonce)
 import           Data.Parameterized.Some
 import           Data.Parameterized.TraversableFC
 import           Data.Ratio
-import           Data.Semigroup( (<>) )
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import           Data.Text.Lazy.Builder (Builder)
@@ -130,7 +129,7 @@ import           System.IO.Streams (OutputStream)
 import qualified System.IO.Streams as Streams
 
 import           What4.BaseTypes
-import           What4.Interface (ArrayResultWrapper(..), IndexLit(..), RoundingMode(..), StringLiteral(..), stringInfo)
+import           What4.Interface (RoundingMode(..), stringInfo)
 import           What4.ProblemFeatures
 import qualified What4.Expr.ArrayUpdateMap as AUM
 import qualified What4.Expr.BoolMap as BM
diff --git a/what4/src/What4/Solver/Yices.hs b/what4/src/What4/Solver/Yices.hs
index 875b918a..b1d7dd12 100644
--- a/what4/src/What4/Solver/Yices.hs
+++ b/what4/src/What4/Solver/Yices.hs
@@ -84,7 +84,6 @@ import           Data.Parameterized.NatRepr
 import           Data.Parameterized.Some
 import           Data.Parameterized.TraversableFC
 import           Data.Ratio
-import           Data.Semigroup ( (<>) )
 import           Data.Set (Set)
 import qualified Data.Set as Set
 import           Data.String (fromString)
diff --git a/what4/src/What4/Utils/HandleReader.hs b/what4/src/What4/Utils/HandleReader.hs
index 06f2a86f..4539ec31 100644
--- a/what4/src/What4/Utils/HandleReader.hs
+++ b/what4/src/What4/Utils/HandleReader.hs
@@ -3,7 +3,6 @@ module What4.Utils.HandleReader where
 
 import           Control.Monad (unless)
 import           Data.IORef
-import           Data.Semigroup ( (<>) )
 import           Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Data.Text.Lazy as LazyText