Skip to content

Commit aa1b698

Browse files
authored
Merge pull request #295 from haskell-nix/import-qualified-post
Use `ImportQualifiedPost` everywhere
2 parents 5d68b7b + 2a18df1 commit aa1b698

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+329
-322
lines changed

hnix-store-core/hnix-store-core.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ common commons
3737
, FlexibleContexts
3838
, FlexibleInstances
3939
, GADTs
40+
, ImportQualifiedPost
4041
, ScopedTypeVariables
4142
, StandaloneDeriving
4243
, RecordWildCards

hnix-store-core/src/System/Nix/Base.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import Data.ByteString (ByteString)
88
import Data.Text (Text)
99
import GHC.Generics (Generic)
1010

11-
import qualified Data.Text.Encoding
12-
import qualified Data.ByteString.Base16
13-
import qualified Data.ByteString.Base64
11+
import Data.Text.Encoding qualified
12+
import Data.ByteString.Base16 qualified
13+
import Data.ByteString.Base64 qualified
1414

15-
import qualified System.Nix.Base32 -- Nix has own Base32 encoding
15+
import System.Nix.Base32 qualified -- Nix has own Base32 encoding
1616

1717
-- | Constructors to indicate the base encodings
1818
data BaseEncoding

hnix-store-core/src/System/Nix/Base32.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import Data.Text (Text)
1212
import Data.Vector (Vector)
1313
import Data.Word (Word8)
1414

15-
import qualified Data.Bits
16-
import qualified Data.Bool
17-
import qualified Data.ByteString
18-
import qualified Data.ByteString.Char8
19-
import qualified Data.List
20-
import qualified Data.Maybe
21-
import qualified Data.Text
22-
import qualified Data.Vector
23-
import qualified Numeric
15+
import Data.Bits qualified
16+
import Data.Bool qualified
17+
import Data.ByteString qualified
18+
import Data.ByteString.Char8 qualified
19+
import Data.List qualified
20+
import Data.Maybe qualified
21+
import Data.Text qualified
22+
import Data.Vector qualified
23+
import Numeric qualified
2424

2525
-- omitted: E O U T
2626
digits32 :: Vector Char

hnix-store-core/src/System/Nix/ContentAddress.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import Data.Text.Lazy.Builder (Builder)
1818
import GHC.Generics (Generic)
1919
import System.Nix.Hash (HashAlgo)
2020

21-
import qualified Data.Attoparsec.Text
22-
import qualified Data.Text.Lazy
23-
import qualified Data.Text.Lazy.Builder
24-
import qualified System.Nix.Hash
21+
import Data.Attoparsec.Text qualified
22+
import Data.Text.Lazy qualified
23+
import Data.Text.Lazy.Builder qualified
24+
import System.Nix.Hash qualified
2525

2626
data ContentAddressMethod
2727
= ContentAddressMethod_Flat

hnix-store-core/src/System/Nix/Derivation.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import Data.Text.Lazy.Builder (Builder)
1313
import Nix.Derivation (Derivation(..), DerivationOutput(..))
1414
import System.Nix.StorePath (StoreDir, StorePath)
1515

16-
import qualified Data.Attoparsec.Text.Lazy
17-
import qualified Data.Text
18-
import qualified Data.Text.Lazy
19-
import qualified Data.Text.Lazy.Builder
16+
import Data.Attoparsec.Text.Lazy qualified
17+
import Data.Text qualified
18+
import Data.Text.Lazy qualified
19+
import Data.Text.Lazy.Builder qualified
2020

21-
import qualified Nix.Derivation
22-
import qualified System.Nix.StorePath
21+
import Nix.Derivation qualified
22+
import System.Nix.StorePath qualified
2323

2424
parseDerivation :: StoreDir -> Parser (Derivation StorePath Text)
2525
parseDerivation expectedRoot =

hnix-store-core/src/System/Nix/DerivedPath.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import Data.Text (Text)
1616
import System.Nix.OutputName (OutputName, InvalidNameError)
1717
import System.Nix.StorePath (StoreDir(..), StorePath, InvalidPathError)
1818

19-
import qualified Data.Bifunctor
20-
import qualified Data.ByteString.Char8
21-
import qualified Data.Set
22-
import qualified Data.Text
23-
import qualified System.Nix.OutputName
24-
import qualified System.Nix.StorePath
19+
import Data.Bifunctor qualified
20+
import Data.ByteString.Char8 qualified
21+
import Data.Set qualified
22+
import Data.Text qualified
23+
import System.Nix.OutputName qualified
24+
import System.Nix.StorePath qualified
2525

2626
data OutputsSpec =
2727
OutputsSpec_All

hnix-store-core/src/System/Nix/Fingerprint.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import System.Nix.Hash (HashAlgo, algoDigestBuilder)
2020
import System.Nix.StorePath
2121
import System.Nix.StorePath.Metadata (Metadata(..))
2222

23-
import qualified Data.HashSet as HashSet
24-
import qualified Data.Text as Text
23+
import Data.HashSet qualified as HashSet
24+
import Data.Text qualified as Text
2525

2626
-- | Produce the message signed by a NAR signature
2727
metadataFingerprint :: StoreDir -> StorePath -> Metadata StorePath -> Text

hnix-store-core/src/System/Nix/Hash.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ import Data.Text (Text)
3838
import Data.Text.Lazy.Builder (Builder)
3939
import System.Nix.Base (BaseEncoding(..))
4040

41-
import qualified Crypto.Hash
42-
import qualified Data.ByteArray
43-
import qualified Data.Text
44-
import qualified Data.Text.Lazy.Builder
45-
import qualified System.Nix.Base
46-
import qualified System.Nix.Hash.Truncation
41+
import Crypto.Hash qualified
42+
import Data.ByteArray qualified
43+
import Data.Text qualified
44+
import Data.Text.Lazy.Builder qualified
45+
import System.Nix.Base qualified
46+
import System.Nix.Hash.Truncation qualified
4747

4848
-- | A 'HashAlgorithm' with a canonical name, for serialization
4949
-- purposes (e.g. SRI hashes)

hnix-store-core/src/System/Nix/Hash/Truncation.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ module System.Nix.Hash.Truncation
55
import Data.Word (Word8)
66
import Data.ByteString (ByteString)
77

8-
import qualified Data.ByteString
9-
import qualified Data.Bits
10-
import qualified Data.Bool
11-
import qualified Data.List
8+
import Data.ByteString qualified
9+
import Data.Bits qualified
10+
import Data.Bool qualified
11+
import Data.List qualified
1212

1313
-- | Bytewise truncation of a 'Digest'.
1414
--

hnix-store-core/src/System/Nix/OutputName.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import Data.Text (Text)
1616
import GHC.Generics (Generic)
1717
import System.Nix.StorePath (InvalidNameError)
1818

19-
import qualified System.Nix.StorePath
19+
import System.Nix.StorePath qualified
2020

2121
-- | Name of the derived path output
2222
-- Typically used for "dev", "doc" sub-outputs

0 commit comments

Comments
 (0)