Remove NoImplicitPrelude from cardano-submit-api

IntersectMBO · Feb 6, 2023 · ce2affe · ce2affe
1 parent e6b9323
commit ce2affe
Show file tree

Hide file tree

Showing 15 changed files with 1 addition and 60 deletions.
diff --git a/cardano-submit-api/app/Main.hs b/cardano-submit-api/app/Main.hs
@@ -1,8 +1,6 @@
 module Main where
 
 import           Cardano.TxSubmit (opts, runTxSubmitWebapi)
-import           Control.Monad ((=<<))
-import           System.IO (IO)
 
 import qualified Options.Applicative as Opt
 

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -19,23 +19,19 @@ extra-source-files:     CHANGELOG.md
 common project-config
   default-language:     Haskell2010
   build-depends:        base >= 4.14 && < 4.17
-  default-extensions:   NoImplicitPrelude
 
   ghc-options:          -Wall
                         -Wcompat
                         -Wincomplete-record-updates
                         -Wincomplete-uni-patterns
                         -Wno-all-missed-specialisations
-                        -Wno-implicit-prelude
                         -Wno-missing-import-lists
                         -Wno-safe
                         -Wno-unsafe
                         -Wunused-packages
                         -fwarn-incomplete-patterns
                         -fwarn-redundant-constraints
 
-  default-extensions:   NoImplicitPrelude
-
 library
   import:               project-config
   build-depends:        base >= 4.14 && < 4.17

diff --git a/cardano-submit-api/src/Cardano/TxSubmit.hs b/cardano-submit-api/src/Cardano/TxSubmit.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.TxSubmit
@@ -14,13 +13,9 @@ import           Cardano.TxSubmit.Config (GenTxSubmitNodeConfig (..), ToggleLogg
                    TxSubmitNodeConfig, readTxSubmitNodeConfig)
 import           Cardano.TxSubmit.Metrics (registerMetricsServer)
 import           Cardano.TxSubmit.Web (runTxSubmitServer)
-import           Control.Applicative (Applicative (..))
 import           Control.Monad (void)
 import           Control.Monad.IO.Class (MonadIO (liftIO))
-import           Data.Either (Either (..))
-import           Data.Function (($))
 import           Data.Text (Text)
-import           System.IO (IO)
 
 import qualified Cardano.BM.Setup as Logging
 import qualified Cardano.BM.Trace as Logging

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Parsers.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.TxSubmit.CLI.Parsers
@@ -14,11 +13,7 @@ import           Cardano.Api (AnyConsensusModeParams (..), ConsensusModeParams (
                    EpochSlots (..), NetworkId (..), NetworkMagic (..), SocketPath (..))
 import           Cardano.TxSubmit.CLI.Types (ConfigFile (..), TxSubmitNodeParams (..))
 import           Cardano.TxSubmit.Rest.Parsers (pWebserverConfig)
-import           Control.Applicative (Alternative (..), Applicative (..), (<**>))
-import           Data.Function ((.))
-import           Data.Functor (Functor (fmap), (<$>))
-import           Data.Int
-import           Data.Semigroup (Semigroup ((<>)))
+import           Control.Applicative (Alternative (..), (<**>))
 import           Data.Word (Word64)
 import           Options.Applicative (Parser, ParserInfo)
 

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/CLI/Types.hs b/cardano-submit-api/src/Cardano/TxSubmit/CLI/Types.hs
@@ -6,8 +6,6 @@ module Cardano.TxSubmit.CLI.Types
 
 import           Cardano.Api (AnyConsensusModeParams, NetworkId (..), SocketPath)
 import           Cardano.TxSubmit.Rest.Types (WebserverConfig)
-import           Data.Int
-import           System.IO (FilePath)
 
 -- | The product type of all command line arguments
 data TxSubmitNodeParams = TxSubmitNodeParams

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Config.hs b/cardano-submit-api/src/Cardano/TxSubmit/Config.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE FlexibleInstances #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
@@ -14,20 +13,12 @@ module Cardano.TxSubmit.Config
 
 import           Cardano.Api
 
-import           Control.Applicative (Applicative (pure, (<*>)))
 import           Control.Exception (IOException, catch)
 import           Data.Aeson (FromJSON (..), Object, Value (..), (.:))
 import           Data.Aeson.Types (Parser)
 import           Data.Bool (bool)
 import           Data.ByteString (ByteString)
-import           Data.Either (Either (Left, Right))
-import           Data.Eq (Eq)
-import           Data.Function (($))
-import           Data.Functor (Functor (..), (<$>))
-import           Data.Semigroup (Semigroup ((<>)))
 import           Protolude.Panic (panic)
-import           System.IO (FilePath, IO)
-import           Text.Show (Show)
 
 import qualified Cardano.BM.Configuration as Logging
 import qualified Cardano.BM.Configuration.Model as Logging

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/ErrorRender.hs b/cardano-submit-api/src/Cardano/TxSubmit/ErrorRender.hs
@@ -16,7 +16,6 @@ import           Cardano.Api
 import           Cardano.Chain.Byron.API (ApplyMempoolPayloadErr (..))
 import           Cardano.Chain.UTxO.UTxO (UTxOError (..))
 import           Cardano.Chain.UTxO.Validation (TxValidationError (..), UTxOValidationError (..))
-import           Data.Monoid (Monoid (mconcat), (<>))
 import           Data.Text (Text)
 import           Formatting (build, sformat, stext, (%))
 import           Ouroboros.Consensus.Cardano.Block (EraMismatch (..))

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Metrics.hs b/cardano-submit-api/src/Cardano/TxSubmit/Metrics.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.TxSubmit.Metrics
@@ -7,13 +6,8 @@ module Cardano.TxSubmit.Metrics
   , registerMetricsServer
   ) where
 
-import           Control.Applicative (Applicative (pure), (<$>), (<*>))
 import           Control.Concurrent.Async (Async, async)
 import           Control.Monad.Reader (MonadIO (liftIO), MonadReader (ask), ReaderT (runReaderT))
-import           Data.Function (($), (.))
-import           Data.Int
-import           Data.Monoid (Monoid (mempty))
-import           System.IO (IO)
 import           System.Metrics.Prometheus.Concurrent.RegistryT (RegistryT (..), registerGauge,
                    runRegistryT, unRegistryT)
 import           System.Metrics.Prometheus.Http.Scrape (serveMetricsT)

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Rest/Parsers.hs b/cardano-submit-api/src/Cardano/TxSubmit/Rest/Parsers.hs
@@ -7,9 +7,6 @@ module Cardano.TxSubmit.Rest.Parsers
   ) where
 
 import           Cardano.TxSubmit.Rest.Types (WebserverConfig (..))
-import           Control.Applicative (Applicative (pure), (<$>))
-import           Data.Function (($))
-import           Data.Semigroup ((<>))
 import           Data.String (fromString)
 import           Network.Wai.Handler.Warp (HostPreference, Port)
 import           Options.Applicative (Parser, auto, help, long, metavar, option, showDefault,

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Rest/Types.hs b/cardano-submit-api/src/Cardano/TxSubmit/Rest/Types.hs
@@ -7,8 +7,6 @@ module Cardano.TxSubmit.Rest.Types
   ) where
 
 import           Data.Function ((&))
-import           Data.Semigroup ((<>))
-import           Text.Show (Show (..))
 
 import qualified Network.Wai.Handler.Warp as Warp
 

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Rest/Web.hs b/cardano-submit-api/src/Cardano/TxSubmit/Rest/Web.hs
@@ -6,15 +6,11 @@ module Cardano.TxSubmit.Rest.Web
 
 import           Cardano.BM.Trace (Trace, logInfo)
 import           Control.Exception (bracket)
-import           Data.Function (($))
-import           Data.Semigroup ((<>))
 import           Data.Streaming.Network (bindPortTCP)
 import           Data.Text (Text)
 import           Network.Socket (close, getSocketName, withSocketsDo)
 import           Network.Wai.Handler.Warp (Settings, getHost, getPort, runSettingsSocket)
 import           Servant (Application)
-import           System.IO (IO)
-import           Text.Show (Show (..))
 
 import qualified Data.Text as T
 

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Tracing/ToObjectOrphans.hs b/cardano-submit-api/src/Cardano/TxSubmit/Tracing/ToObjectOrphans.hs
@@ -10,13 +10,9 @@ import           Cardano.BM.Data.Severity (Severity (Debug, Error, Notice, Warni
 import           Cardano.BM.Data.Tracer (HasPrivacyAnnotation, HasSeverityAnnotation (..),
                    HasTextFormatter, ToObject (toObject), Transformable (..), trStructured)
 import           Data.Aeson ((.=))
-import           Data.String (String)
 import           Data.Text (Text)
 import           Ouroboros.Network.NodeToClient (ErrorPolicyTrace (..), WithAddr (..))
-import           System.IO (IO)
-import           Text.Show (Show (..))
 
-import           Data.Monoid (mconcat)
 import qualified Network.Socket as Socket
 
 instance HasPrivacyAnnotation (WithAddr Socket.SockAddr ErrorPolicyTrace)

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Types.hs b/cardano-submit-api/src/Cardano/TxSubmit/Types.hs
@@ -19,12 +19,6 @@ import           Cardano.Api (AnyCardanoEra, AnyConsensusMode (..), Error (..),
 import           Cardano.Binary (DecoderError)
 import           Data.Aeson (ToJSON (..), Value (..))
 import           Data.ByteString.Char8 (ByteString)
-import           Data.Either (Either (Right))
-import           Data.Eq (Eq (..))
-import           Data.Function (id, (.))
-import           Data.Functor (Functor (fmap))
-import           Data.Int (Int)
-import           Data.Monoid (Monoid (mconcat), (<>))
 import           Data.Text (Text)
 import           Formatting (build, sformat)
 import           GHC.Generics (Generic)
@@ -33,7 +27,6 @@ import           Ouroboros.Consensus.Cardano.Block (EraMismatch (..))
 import           Servant (Accept (..), JSON, MimeRender (..), MimeUnrender (..), PostAccepted,
                    ReqBody, (:>))
 import           Servant.API.Generic (ToServantApi, (:-))
-import           Text.Show (Show (..))
 
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import qualified Data.List as L

diff --git a/cardano-submit-api/src/Cardano/TxSubmit/Util.hs b/cardano-submit-api/src/Cardano/TxSubmit/Util.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE NoImplicitPrelude #-}
-
 module Cardano.TxSubmit.Util
   ( logException
   ) where

diff --git a/cardano-submit-api/test/test.hs b/cardano-submit-api/test/test.hs
@@ -1,6 +1,3 @@
-
-import           System.IO (IO)
-
 import qualified System.IO as IO
 
 main :: IO ()