fix warningswip/DanielG/ghc-short-bytestring

14 files changed, 1 insertions, 14 deletions

diff --git a/compiler/GHC/Hs/Lit.hs b/compiler/GHC/Hs/Lit.hs
index 752200cf9c..3722f292d8 100644
--- a/compiler/GHC/Hs/Lit.hs
+++ b/compiler/GHC/Hs/Lit.hs
@@ -28,7 +28,6 @@ import Outputable
 import FastString
 import GHC.Hs.Extension
 
-import Data.ByteString (ByteString)
 import Data.ByteString.Short (ShortByteString)
 import Data.Data hiding ( Fixity )
 
diff --git a/compiler/GHC/StgToCmm/Closure.hs b/compiler/GHC/StgToCmm/Closure.hs
index b8522d5889..9ac2b3f79c 100644
--- a/compiler/GHC/StgToCmm/Closure.hs
+++ b/compiler/GHC/StgToCmm/Closure.hs
@@ -89,7 +89,6 @@ import DynFlags
 import Util
 
 import Data.Coerce (coerce)
-import qualified Data.ByteString.Char8 as BS8
 import FastString
 
 -----------------------------------------------------------------------------
diff --git a/compiler/GHC/StgToCmm/Utils.hs b/compiler/GHC/StgToCmm/Utils.hs
index d64d03ca63..8a81966152 100644
--- a/compiler/GHC/StgToCmm/Utils.hs
+++ b/compiler/GHC/StgToCmm/Utils.hs
@@ -73,7 +73,6 @@ import Outputable
 import RepType
 
 import Data.ByteString.Short (ShortByteString)
-import qualified Data.ByteString.Char8 as BS8
 import qualified Data.Map as M
 import Data.Char
 import Data.List
diff --git a/compiler/basicTypes/DataCon.hs b/compiler/basicTypes/DataCon.hs
index 202c246919..603cd7ae30 100644
--- a/compiler/basicTypes/DataCon.hs
+++ b/compiler/basicTypes/DataCon.hs
@@ -85,7 +85,6 @@ import Binary
 import UniqSet
 import Unique( mkAlphaTyVarUnique )
 
-import Data.ByteString (ByteString)
 import qualified Data.ByteString.Builder as BSB
 import qualified Data.ByteString.Short as BSS
 import qualified Data.ByteString.Lazy    as LBS
diff --git a/compiler/basicTypes/Literal.hs b/compiler/basicTypes/Literal.hs
index 5f2c568aa7..5d55950d2f 100644
--- a/compiler/basicTypes/Literal.hs
+++ b/compiler/basicTypes/Literal.hs
@@ -65,7 +65,6 @@ import GHC.Platform
 import UniqFM
 import Util
 
-import Data.ByteString.Short (ShortByteString)
 import Data.Int
 import Data.Word
 import Data.Char
diff --git a/compiler/cmm/PprCmmDecl.hs b/compiler/cmm/PprCmmDecl.hs
index fa534b5c19..9fadde7c0c 100644
--- a/compiler/cmm/PprCmmDecl.hs
+++ b/compiler/cmm/PprCmmDecl.hs
@@ -50,7 +50,6 @@ import FastString
 import Data.List
 import System.IO
 
-import qualified Data.ByteString as BS
 import qualified Data.ByteString.Short as BSS
 
 
diff --git a/compiler/coreSyn/CoreUnfold.hs b/compiler/coreSyn/CoreUnfold.hs
index 943ff938b2..53b3d50ef9 100644
--- a/compiler/coreSyn/CoreUnfold.hs
+++ b/compiler/coreSyn/CoreUnfold.hs
@@ -67,7 +67,6 @@ import Outputable
 import ForeignCall
 import Name
 
-import qualified Data.ByteString as BS
 import Data.List
 
 {-
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index fdc83cd30c..7758a78e61 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -92,7 +92,6 @@ import BasicTypes       ( Arity, isConLike )
 import GHC.Platform
 import Util
 import Pair
-import Data.ByteString     ( ByteString )
 import Data.Function       ( on )
 import Data.List
 import Data.Ord            ( comparing )
diff --git a/compiler/ghci/ByteCodeGen.hs b/compiler/ghci/ByteCodeGen.hs
index 8688e2e9b7..f96859d407 100644
--- a/compiler/ghci/ByteCodeGen.hs
+++ b/compiler/ghci/ByteCodeGen.hs
@@ -66,7 +66,6 @@ import Module
 
 import Control.Exception
 import Data.Array
-import Data.ByteString (ByteString)
 import Data.ByteString.Short (ShortByteString)
 import Data.Map (Map)
 import Data.IntMap (IntMap)
diff --git a/compiler/ghci/ByteCodeTypes.hs b/compiler/ghci/ByteCodeTypes.hs
index ac8b6c053f..d8d640db18 100644
--- a/compiler/ghci/ByteCodeTypes.hs
+++ b/compiler/ghci/ByteCodeTypes.hs
@@ -32,7 +32,6 @@ import Control.DeepSeq
 import Foreign
 import Data.Array
 import Data.Array.Base  ( UArray(..) )
-import Data.ByteString (ByteString)
 import Data.ByteString.Short (ShortByteString)
 import Data.IntMap (IntMap)
 import qualified Data.IntMap as IntMap
diff --git a/compiler/ghci/GHCi.hs b/compiler/ghci/GHCi.hs
index 4f3933a9b6..95ccd02017 100644
--- a/compiler/ghci/GHCi.hs
+++ b/compiler/ghci/GHCi.hs
@@ -75,7 +75,6 @@ import Control.Monad
 import Control.Monad.IO.Class
 import Data.Binary
 import Data.Binary.Put
-import Data.ByteString (ByteString)
 import Data.ByteString.Short (ShortByteString)
 import qualified Data.ByteString.Lazy as LB
 import Data.IORef
diff --git a/compiler/prelude/PrelRules.hs b/compiler/prelude/PrelRules.hs
index 41ebfcf688..5ca40fd991 100644
--- a/compiler/prelude/PrelRules.hs
+++ b/compiler/prelude/PrelRules.hs
@@ -61,7 +61,6 @@ import Control.Applicative ( Alternative(..) )
 import Control.Monad
 import qualified Control.Monad.Fail as MonadFail
 import Data.Bits as Bits
-import qualified Data.ByteString as BS
 import Data.Int
 import Data.Ratio
 import Data.Word
diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs
index 32137ff7c2..e7473b52cc 100644
--- a/compiler/utils/Outputable.hs
+++ b/compiler/utils/Outputable.hs
@@ -108,7 +108,6 @@ import Panic
 import GHC.Serialized
 import GHC.LanguageExtensions (Extension)
 
-import Data.ByteString (ByteString)
 import qualified Data.ByteString.Short as BS
 import Data.Char
 import qualified Data.Map as M
diff --git a/hadrian/ghci.sh b/hadrian/ghci.sh
index f31b94574f..2619e6d515 100755
--- a/hadrian/ghci.sh
+++ b/hadrian/ghci.sh
@@ -3,4 +3,4 @@
 set -e
 
 GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build.cabal.sh" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")"
-ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m
+ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m -RTS -Werror