Skip to content

Commit

Permalink
Remove redundant imports
Browse files Browse the repository at this point in the history
GHC 8.10 detects more redundant warnings than previous versions. Removing
them *doesn't* break compatibility with GHC 8.6, they were already redundant
imports for GHC 8.6, the compiler just didn't realise it before.
  • Loading branch information
mrBliss committed Oct 19, 2020
1 parent 1478bd3 commit 645bca0
Show file tree
Hide file tree
Showing 60 changed files with 18 additions and 121 deletions.
2 changes: 0 additions & 2 deletions cardano-api/src/Cardano/Api/Crypto/Ed25519Bip32.hs
Expand Up @@ -22,9 +22,7 @@ import Cardano.Prelude hiding (show)
import Prelude (show)

import Data.ByteArray as BA (ByteArrayAccess, ScrubbedBytes, convert)
import Data.ByteString (ByteString)
import qualified Data.ByteString as BS
import GHC.Generics (Generic)
import NoThunks.Class (NoThunks, InspectHeap (..))

import Cardano.Binary (FromCBOR (..), ToCBOR (..))
Expand Down
4 changes: 2 additions & 2 deletions cardano-api/src/Cardano/Api/LocalChainSync.hs
Expand Up @@ -13,8 +13,8 @@ import Control.Concurrent.STM
import Ouroboros.Consensus.Ledger.Abstract (Query, ShowQuery)
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, GenTx)
import Ouroboros.Network.Block (Tip)
import Ouroboros.Network.Protocol.ChainSync.Client (ChainSyncClient (..),
ClientStIdle (..), ClientStNext (..))
import Ouroboros.Network.Protocol.ChainSync.Client (ClientStIdle (..),
ClientStNext (..))
import Ouroboros.Network.Util.ShowProxy (ShowProxy)


Expand Down
1 change: 0 additions & 1 deletion cardano-api/src/Cardano/Api/TextView.hs
Expand Up @@ -25,7 +25,6 @@ import Prelude (String)
import Data.Aeson (FromJSON (..), ToJSON (..), object, withObject, (.:), (.=))
import Data.Aeson.Encode.Pretty (Config (..), defConfig, keyOrder)
import qualified Data.ByteString.Base16 as Base16
import Data.ByteString.Char8 (ByteString)
import qualified Data.Text as Text
import qualified Data.Text.Encoding as Text

Expand Down
1 change: 0 additions & 1 deletion cardano-api/src/Cardano/Api/TxSubmit.hs
Expand Up @@ -25,7 +25,6 @@ import Ouroboros.Consensus.Cardano.Block (CardanoApplyTxErr,
GenTx (GenTxByron, GenTxShelley),
HardForkApplyTxErr (ApplyTxErrAllegra, ApplyTxErrByron, ApplyTxErrMary, ApplyTxErrShelley, ApplyTxErrWrongEra))
import Ouroboros.Consensus.HardFork.Combinator.Degenerate
import Ouroboros.Consensus.Shelley.Eras (StandardShelley)
import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock, mkShelleyTx)
import Ouroboros.Consensus.Shelley.Protocol.Crypto (StandardCrypto)

Expand Down
1 change: 0 additions & 1 deletion cardano-api/src/Cardano/Api/TxSubmit/ErrorRender.hs
Expand Up @@ -14,7 +14,6 @@ import Cardano.Chain.UTxO.Validation (TxValidationError (..), UTxOVali

import Cardano.Prelude hiding ((%))

import Data.Text (Text)
import qualified Data.Text as Text

import Formatting (build, sformat, stext, (%))
Expand Down
1 change: 0 additions & 1 deletion cardano-api/src/Cardano/Api/TxSubmit/Types.hs
Expand Up @@ -17,7 +17,6 @@ import Cardano.Prelude hiding ((%))

import Data.Aeson (ToJSON (..), Value (..))
import qualified Data.Aeson as Aeson
import Data.Text (Text)
import qualified Data.Text as Text

import Formatting (build, sformat, (%))
Expand Down
2 changes: 0 additions & 2 deletions cardano-api/test/Test/Cardano/Api/Crypto.hs
Expand Up @@ -15,8 +15,6 @@ where
import Cardano.Prelude
import Prelude (String)

import Data.Proxy (Proxy (..))

import Cardano.Api.Crypto.Ed25519Bip32 (Ed25519Bip32DSIGN, SignKeyDSIGN (..))

import Cardano.Crypto.DSIGN
Expand Down
2 changes: 0 additions & 2 deletions cardano-api/test/Test/Cardano/Api/Typed/Gen.hs
Expand Up @@ -26,8 +26,6 @@ import Control.Monad.Fail (fail)
import qualified Cardano.Binary as CBOR
import qualified Cardano.Crypto.Hash as Crypto
import qualified Cardano.Crypto.Seed as Crypto
import Cardano.Slotting.Slot (SlotNo (..))
import Ouroboros.Network.Magic (NetworkMagic (..))

import Hedgehog (Gen)
import qualified Hedgehog.Gen as Gen
Expand Down
3 changes: 0 additions & 3 deletions cardano-cli/src/Cardano/CLI/Byron/Genesis.hs
Expand Up @@ -19,12 +19,9 @@ where
import Cardano.Prelude hiding (option, show, trace)
import Prelude (String, show)

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, left, right)
import qualified Data.ByteString.Lazy as LB
import qualified Data.Map.Strict as Map
import Data.String (IsString)
import Data.Text.Encoding (encodeUtf8)
import Data.Text.Lazy.Builder (toLazyText)
import Data.Time (UTCTime)
import Formatting.Buildable
Expand Down
6 changes: 2 additions & 4 deletions cardano-cli/src/Cardano/CLI/Byron/Key.hs
Expand Up @@ -28,18 +28,16 @@ import Prelude (String, show)
import Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes)
import Codec.CBOR.Write (toLazyByteString)

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither)
import qualified Data.ByteArray as BA
import qualified Data.ByteString as SB
import qualified Data.ByteString.Lazy as LB
import qualified Data.ByteString.UTF8 as UTF8
import Data.String (IsString, fromString)
import Data.Text (Text)
import Data.String (fromString)
import qualified Data.Text as T
import Formatting (build, sformat, (%))

import System.IO (hFlush, hSetEcho, stdin, stdout)
import System.IO (hFlush, hSetEcho)

import qualified Cardano.Chain.Common as Common
import qualified Cardano.Chain.Genesis as Genesis
Expand Down
2 changes: 0 additions & 2 deletions cardano-cli/src/Cardano/CLI/Byron/Legacy.hs
Expand Up @@ -15,8 +15,6 @@ import Cardano.Prelude hiding (option)
import qualified Codec.CBOR.Decoding as D
import qualified Codec.CBOR.Encoding as E
import Data.Coerce (coerce)
import Data.Semigroup ((<>))
import Data.Text (Text)
import qualified Data.Text as T
import Lens.Micro (LensLike, _Left)

Expand Down
2 changes: 0 additions & 2 deletions cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
Expand Up @@ -24,8 +24,6 @@ module Cardano.CLI.Byron.Parsers
import Cardano.Prelude hiding (option)
import Prelude (String)

import Control.Applicative ((<|>))
import Data.Bifunctor (first, second)
import qualified Data.ByteString.Lazy.Char8 as C8
import qualified Data.List.NonEmpty as NE
import qualified Data.Text as Text
Expand Down
2 changes: 0 additions & 2 deletions cardano-cli/src/Cardano/CLI/Byron/Run.hs
Expand Up @@ -6,9 +6,7 @@ module Cardano.CLI.Byron.Run

import Cardano.Prelude

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither)
import Data.Semigroup ((<>))
import qualified Data.Text.Lazy.Builder as Builder
import qualified Data.Text.Lazy.IO as TL
import qualified Formatting as F
Expand Down
2 changes: 0 additions & 2 deletions cardano-cli/src/Cardano/CLI/Byron/Tx.hs
Expand Up @@ -26,8 +26,6 @@ import Control.Monad.Trans.Except.Extra (firstExceptT, left)
import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy as LB
import qualified Data.Map.Strict as Map
import Data.String (IsString)
import Data.Text (Text)
import qualified Data.Text as T
import qualified Data.Vector as Vector
import Formatting (sformat, (%))
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Environment.hs
Expand Up @@ -9,7 +9,6 @@ module Cardano.CLI.Environment
import Cardano.Prelude
import Prelude (String)

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (left)
import qualified Data.Text as Text
import System.Environment (lookupEnv)
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Helpers.hs
Expand Up @@ -17,7 +17,6 @@ import Cardano.Prelude
import Codec.CBOR.Pretty (prettyHexEnc)
import Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes)
import Codec.CBOR.Term (decodeTerm, encodeTerm)
import Control.Exception (IOException)
import Control.Monad.Trans.Except.Extra (handleIOExceptT, left)
import qualified Data.ByteString.Lazy as LB
import qualified Data.Text as Text
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Run.hs
Expand Up @@ -9,7 +9,6 @@ module Cardano.CLI.Run

import Cardano.Prelude

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT)
import qualified Data.Text as Text

Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Orphans.hs
Expand Up @@ -41,7 +41,6 @@ import qualified Shelley.Spec.Ledger.EpochBoundary as Ledger
import qualified Shelley.Spec.Ledger.Keys as Ledger
import qualified Shelley.Spec.Ledger.LedgerState as Ledger
import Shelley.Spec.Ledger.MetaData (MetaDataHash (..))
import Shelley.Spec.Ledger.PParams (PParams' (..))
import qualified Shelley.Spec.Ledger.PParams as Ledger
import qualified Shelley.Spec.Ledger.Rewards as Ledger
import Shelley.Spec.Ledger.TxBody (TxId (..), TxIn (..), TxOut (..))
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
Expand Up @@ -25,7 +25,6 @@ import Cardano.CLI.Shelley.Key (InputFormat (..), VerificationKeyOrFil
VerificationKeyOrHashOrFile (..), VerificationKeyTextOrFile (..),
deserialiseInput, renderInputDecodeError)
import Cardano.CLI.Types
import Cardano.Slotting.Slot (EpochNo (..), SlotNo (..))
import Control.Monad.Fail (fail)
import Data.Attoparsec.Combinator ((<?>))
import Data.Time.Clock (UTCTime)
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run.hs
Expand Up @@ -6,7 +6,6 @@ module Cardano.CLI.Shelley.Run

import Cardano.Prelude

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT)

import Cardano.CLI.Shelley.Parsers
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/Address.hs
Expand Up @@ -15,7 +15,6 @@ import qualified Data.ByteString.Lazy as LB
import qualified Data.Text as Text
import qualified Data.Text.IO as Text

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, left, newExceptT)

import Cardano.Api.TextView (TextViewDescription (..))
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/Address/Info.hs
Expand Up @@ -7,7 +7,6 @@ module Cardano.CLI.Shelley.Run.Address.Info
import Cardano.Api.Typed
import Cardano.CLI.Shelley.Parsers (OutputFile (..))
import Cardano.Prelude
import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (left)
import Data.Aeson (ToJSON (..), object, (.=))
import Data.Aeson.Encode.Pretty (encodePretty)
Expand Down
4 changes: 0 additions & 4 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
Expand Up @@ -14,9 +14,7 @@ import qualified Data.Aeson as Aeson
import Data.Aeson.Encode.Pretty (encodePretty)
import qualified Data.ByteString.Char8 as BS
import qualified Data.ByteString.Lazy.Char8 as LBS
import Data.Char (isDigit)
import qualified Data.List as List
import Data.Map.Strict (Map)
import qualified Data.Map.Strict as Map
import qualified Data.Text as Text
import qualified Data.Text.IO as Text
Expand All @@ -26,7 +24,6 @@ import System.Directory (createDirectoryIfMissing, listDirectory)
import System.FilePath (takeExtension, takeExtensions, (</>))
import System.IO.Error (isDoesNotExistError)

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left,
newExceptT)

Expand All @@ -37,7 +34,6 @@ import Cardano.Api.TextView (TextViewDescription (..))
import Cardano.Api.Typed

import Ouroboros.Consensus.BlockchainTime (SystemStart (..))
import Ouroboros.Consensus.Shelley.Eras (StandardShelley)

import qualified Shelley.Spec.Ledger.Address as Ledger
import qualified Shelley.Spec.Ledger.Coin as Ledger
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/Governance.hs
Expand Up @@ -8,7 +8,6 @@ import Cardano.Prelude

import qualified Data.Text as Text

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, left, newExceptT, right)

import Cardano.Api.TextView (TextViewDescription (..), textShow)
Expand Down
2 changes: 0 additions & 2 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Key.hs
Expand Up @@ -16,10 +16,8 @@ import Cardano.Prelude
import qualified Data.ByteString as BS
import qualified Data.ByteString.Char8 as BSC
import qualified Data.Text as Text
import Data.Text.Encoding (encodeUtf8)

import qualified Control.Exception as Exception
import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, left, newExceptT)

import qualified Codec.Binary.Bech32 as Bech32
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/Node.hs
Expand Up @@ -11,7 +11,6 @@ import Cardano.CLI.Shelley.Key (InputDecodeError, VerificationKeyOrFil
readSigningKeyFileAnyOf, readVerificationKeyOrFile)
import Cardano.CLI.Types (SigningKeyFile (..), VerificationKeyFile (..))
import Cardano.Prelude
import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, hoistEither, newExceptT)
import Prelude (id)

Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/Pool.hs
Expand Up @@ -9,7 +9,6 @@ import Cardano.Prelude
import qualified Data.Text as Text
import qualified Data.Text.IO as Text

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither,
newExceptT)

Expand Down
6 changes: 0 additions & 6 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Query.hs
Expand Up @@ -22,16 +22,13 @@ import qualified Data.Aeson as Aeson
import Data.Aeson.Encode.Pretty (encodePretty)
import qualified Data.ByteString.Lazy.Char8 as LBS
import qualified Data.Map.Strict as Map
import Data.Set (Set)
import qualified Data.Set as Set
import Data.Text (Text)
import qualified Data.Text as Text
import qualified Data.Text.Encoding as Text
import qualified Data.Text.IO as Text
import qualified Data.Vector as Vector
import Numeric (showEFloat)

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, newExceptT)

import Cardano.Api.LocalChainSync (getLocalTip)
Expand All @@ -50,12 +47,9 @@ import Cardano.Crypto.Hash (hashToBytesAsHex)
import Ouroboros.Consensus.Cardano.Block (Either (..), EraMismatch (..), Query (..))
import Ouroboros.Consensus.HardFork.Combinator.Degenerate (Either (DegenQueryResult),
Query (DegenQuery))
import Ouroboros.Consensus.Shelley.Eras (StandardShelley)
import Ouroboros.Network.Block (Serialised (..), getTipPoint)


import qualified Shelley.Spec.Ledger.Address as Ledger
import Shelley.Spec.Ledger.Coin (Coin (..))
import qualified Shelley.Spec.Ledger.Credential as Ledger
import Shelley.Spec.Ledger.Delegation.Certificates (IndividualPoolStake (..),
PoolDistr (..))
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/StakeAddress.hs
Expand Up @@ -10,7 +10,6 @@ import qualified Data.ByteString.Char8 as BS
import qualified Data.Text as Text
import qualified Data.Text.IO as Text

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, newExceptT)

import Cardano.Api.TextView (TextViewDescription (..))
Expand Down
1 change: 0 additions & 1 deletion cardano-cli/src/Cardano/CLI/Shelley/Run/TextView.hs
Expand Up @@ -15,7 +15,6 @@ import Cardano.Api.TextView (TextView (..))
import Cardano.Api.Typed (Error (..), FileError, TextEnvelopeError,
readTextEnvelopeFromFile)

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, newExceptT)

import qualified Data.ByteString.Lazy.Char8 as LBS
Expand Down
2 changes: 0 additions & 2 deletions cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
Expand Up @@ -18,7 +18,6 @@ import qualified Data.ByteString.Lazy as LBS
import qualified Data.List.NonEmpty as NE
import qualified Data.Text as Text

import Control.Monad.Trans.Except (ExceptT)
import Control.Monad.Trans.Except.Extra (firstExceptT, handleIOExceptT, hoistEither, left,
newExceptT)

Expand All @@ -30,7 +29,6 @@ import qualified Shelley.Spec.Ledger.PParams as Shelley
import Ouroboros.Consensus.Byron.Ledger (ByronBlock)
import Ouroboros.Consensus.Cardano.Block (EraMismatch (..), HardForkApplyTxErr (..))
import Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
import Ouroboros.Consensus.Shelley.Eras (StandardShelley)
import Ouroboros.Consensus.Shelley.Ledger (ShelleyBlock)

import Cardano.CLI.Environment (EnvSocketError, readEnvSocketPath, renderEnvSocketError)
Expand Down
2 changes: 0 additions & 2 deletions cardano-config/src/Cardano/Config/Git/Rev.hs
Expand Up @@ -9,9 +9,7 @@ module Cardano.Config.Git.Rev (
import Cardano.Prelude

import Data.FileEmbed (dummySpaceWith)
import Data.Text (Text)
import qualified Data.Text as T
import Data.Text.Encoding (decodeUtf8)

import Cardano.Config.Git.RevFromGit (gitRevFromGit)

Expand Down
1 change: 0 additions & 1 deletion cardano-config/src/Cardano/Config/Git/RevFromGit.hs
Expand Up @@ -6,7 +6,6 @@ import Cardano.Prelude
import Prelude (String)

import qualified Language.Haskell.TH as TH
import System.Exit (ExitCode (..))
import System.IO.Error (ioeGetErrorType, isDoesNotExistErrorType)
import System.Process (readProcessWithExitCode)

Expand Down
5 changes: 0 additions & 5 deletions cardano-node-chairman/app/Cardano/Chairman.hs
Expand Up @@ -14,7 +14,6 @@ module Cardano.Chairman (chairmanTest) where
import Cardano.Api.Protocol.Types (SomeNodeClientProtocol (..))
import Cardano.Node.Types (SocketPath (..))
import Cardano.Prelude hiding (ByteString, STM, atomically, catch, option, show, throwIO)
import Control.Monad (void)
import Control.Monad.Class.MonadAsync
import Control.Monad.Class.MonadST
import Control.Monad.Class.MonadSTM.Strict
Expand All @@ -24,10 +23,6 @@ import Control.Monad.Class.MonadTimer
import Control.Tracer
import Data.ByteString.Lazy (ByteString)
import Data.Coerce (coerce)
import Data.Map.Strict (Map)
import Data.Proxy (Proxy (..))
import Data.Void (Void)
import Network.Mux (MuxError, MuxMode (..))
import Ouroboros.Consensus.Block (BlockProtocol, CodecConfig, GetHeader (..), Header)
import Ouroboros.Consensus.BlockchainTime (SlotLength, getSlotLength)
import Ouroboros.Consensus.Cardano
Expand Down
1 change: 0 additions & 1 deletion cardano-node-chairman/app/Cardano/Chairman/Options.hs
Expand Up @@ -18,7 +18,6 @@ import Cardano.Chain.Slotting (EpochSlots (..))
import Cardano.Node.Protocol.Types (Protocol (..))
import Cardano.Node.Types
import Cardano.Prelude hiding (option)
import Control.Applicative (some)
import Control.Monad.Class.MonadTime (DiffTime)
import Options.Applicative
import Ouroboros.Consensus.BlockchainTime (SlotLength, slotLengthFromSec)
Expand Down
1 change: 0 additions & 1 deletion cardano-node/app/cardano-node.hs
Expand Up @@ -6,7 +6,6 @@ import Cardano.Prelude hiding (option)
import qualified Data.Text as Text
import Prelude (String)

import Data.Semigroup ((<>))
import Options.Applicative
import qualified Options.Applicative as Opt
import Options.Applicative.Help ((<$$>))
Expand Down

0 comments on commit 645bca0

Please sign in to comment.