Skip to content

Commit 6e8a2f9

Browse files
committed
post qualified
1 parent 9198d7d commit 6e8a2f9

12 files changed

+15
-80
lines changed

.github/workflows/haskell-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [ubuntu-latest]
25-
ghc-version: ['9.8', '9.6', '9.4', '9.2', '8.10']
25+
ghc-version: ['9.8', '9.6', '9.4', '9.2']
2626
docspec: [false]
2727
experimental: [false]
2828

numhask.cabal

+3-68
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: numhask
3-
version: 0.12
3+
version: 0.12.0.0
44
license: BSD-3-Clause
55
license-file: LICENSE
66
copyright: Tony Day (c) 2016
@@ -27,7 +27,7 @@ description:
2727

2828
build-type: Simple
2929
tested-with:
30-
GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 || ==9.2.8 || ==9.4.5 || ==9.6.2 || ==9.8.1
30+
GHC ==9.2.8 || ==9.4.5 || ==9.6.2 || ==9.8.1
3131
extra-doc-files:
3232
ChangeLog.md
3333
other/*.svg
@@ -46,74 +46,14 @@ common ghc-options-stanza
4646
-Wpartial-fields
4747
-Wredundant-constraints
4848

49-
if impl ( ghc >= 8.8 )
50-
ghc-options:
51-
-fwrite-ide-info
52-
-hiedir=.hie
53-
5449
common ghc2021-stanza
55-
if impl ( ghc >= 9.2 )
56-
default-language: GHC2021
57-
58-
if impl ( ghc < 9.2 )
59-
default-language: Haskell2010
60-
default-extensions:
61-
BangPatterns
62-
BinaryLiterals
63-
ConstrainedClassMethods
64-
ConstraintKinds
65-
DeriveDataTypeable
66-
DeriveFoldable
67-
DeriveFunctor
68-
DeriveGeneric
69-
DeriveLift
70-
DeriveTraversable
71-
DoAndIfThenElse
72-
EmptyCase
73-
EmptyDataDecls
74-
EmptyDataDeriving
75-
ExistentialQuantification
76-
ExplicitForAll
77-
FlexibleContexts
78-
FlexibleInstances
79-
ForeignFunctionInterface
80-
GADTSyntax
81-
GeneralisedNewtypeDeriving
82-
HexFloatLiterals
83-
ImplicitPrelude
84-
InstanceSigs
85-
KindSignatures
86-
MonomorphismRestriction
87-
MultiParamTypeClasses
88-
NamedFieldPuns
89-
NamedWildCards
90-
NumericUnderscores
91-
PatternGuards
92-
PolyKinds
93-
PostfixOperators
94-
RankNTypes
95-
RelaxedPolyRec
96-
ScopedTypeVariables
97-
StandaloneDeriving
98-
StarIsType
99-
TraditionalRecordSyntax
100-
TupleSections
101-
TypeApplications
102-
TypeOperators
103-
TypeSynonymInstances
104-
105-
if impl ( ghc < 9.2 ) && impl ( ghc >= 8.10 )
106-
default-extensions:
107-
ImportQualifiedPost
108-
StandaloneKindSignatures
50+
default-language: GHC2021
10951

11052
library
11153
import: ghc-options-stanza
11254
import: ghc2021-stanza
11355
hs-source-dirs: src
11456
build-depends:
115-
-- keeping cabal-docspec happy
116-
, QuickCheck >=2.14 && <3
11757
, base >=4.7 && <5
11858
exposed-modules:
11959
NumHask
@@ -132,9 +72,4 @@ library
13272
NumHask.Data.Wrapped
13373
NumHask.Exception
13474
NumHask.Prelude
135-
other-modules:
13675
default-extensions: RebindableSyntax
137-
138-
-- keeping ormolu happy
139-
if impl ( ghc >= 8.10 )
140-
default-extensions: NoImportQualifiedPost

src/NumHask/Algebra/Additive.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import Data.Traversable (mapAccumL)
1414
import Data.Word (Word, Word16, Word32, Word64, Word8)
1515
import GHC.Natural (Natural (..))
1616
import Prelude (Bool, Double, Eq, Float, Int, Integer, Ord, Show, fromInteger)
17-
import qualified Prelude as P
17+
import Prelude qualified as P
1818

1919
-- $setup
2020
--

src/NumHask/Algebra/Field.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import NumHask.Algebra.Multiplicative
2626
import NumHask.Algebra.Ring (Distributive, Ring, two)
2727
import NumHask.Data.Integral (Integral, even)
2828
import Prelude ((.))
29-
import qualified Prelude as P
29+
import Prelude qualified as P
3030

3131
-- $setup
3232
--

src/NumHask/Algebra/Metric.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import NumHask.Algebra.Lattice
4040
import NumHask.Algebra.Multiplicative
4141
import NumHask.Algebra.Ring
4242
import Prelude (Double, Eq (..), Float, Functor (..), Int, Integer, Ord, Show, Word, fromRational)
43-
import qualified Prelude as P
43+
import Prelude qualified as P
4444

4545
-- $setup
4646
--

src/NumHask/Algebra/Multiplicative.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import Data.Traversable (mapAccumL)
1313
import Data.Word (Word, Word16, Word32, Word64, Word8)
1414
import GHC.Natural (Natural (..))
1515
import Prelude (Double, Eq, Float, Int, Integer, Ord, Show, fromInteger, fromRational)
16-
import qualified Prelude as P
16+
import Prelude qualified as P
1717

1818
-- $setup
1919
--

src/NumHask/Algebra/Ring.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import GHC.Natural (Natural (..))
1515
import NumHask.Algebra.Additive (Additive ((+)), Subtractive)
1616
import NumHask.Algebra.Group (Idempotent)
1717
import NumHask.Algebra.Multiplicative (Multiplicative (..))
18-
import qualified Prelude as P
18+
import Prelude qualified as P
1919

2020
-- $setup
2121
--

src/NumHask/Data/Integral.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import NumHask.Algebra.Additive
2121
import NumHask.Algebra.Multiplicative
2222
import NumHask.Algebra.Ring
2323
import Prelude (Double, Float, Int, Integer, fst, snd, (.))
24-
import qualified Prelude as P
24+
import Prelude qualified as P
2525

2626
-- $setup
2727
--

src/NumHask/Data/Positive.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import NumHask.Data.Integral
2929
import NumHask.Data.Rational
3030
import NumHask.Data.Wrapped
3131
import Prelude (Eq, Ord, Show)
32-
import qualified Prelude as P
32+
import Prelude qualified as P
3333

3434
-- $setup
3535
--

src/NumHask/Data/Rational.hs

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Data.Int (Int16, Int32, Int64, Int8)
1818
import Data.Word (Word, Word16, Word32, Word64, Word8)
1919
import GHC.Float
2020
import GHC.Natural (Natural (..))
21-
import qualified GHC.Real
21+
import GHC.Real qualified
2222
import NumHask.Algebra.Additive
2323
import NumHask.Algebra.Field
2424
import NumHask.Algebra.Lattice
@@ -27,7 +27,7 @@ import NumHask.Algebra.Multiplicative
2727
import NumHask.Algebra.Ring
2828
import NumHask.Data.Integral
2929
import Prelude (Eq (..), Int, Integer, Ord (..), Ordering (..), (.))
30-
import qualified Prelude as P
30+
import Prelude qualified as P
3131

3232
-- $setup
3333
--

src/NumHask/Data/Wrapped.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import NumHask.Algebra.Multiplicative
1616
import NumHask.Algebra.Ring
1717
import NumHask.Data.Integral
1818
import NumHask.Data.Rational
19-
import qualified Prelude as P
19+
import Prelude qualified as P
2020

2121
-- | Wrapped numhask instances
2222
newtype Wrapped a = Wrapped {unWrapped :: a}

src/NumHask/Exception.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ where
77

88
import Control.Exception
99
import Data.Typeable (Typeable)
10-
import qualified Prelude as P
10+
import Prelude qualified as P
1111

1212
-- | A numhask exception.
1313
newtype NumHaskException = NumHaskException {errorMessage :: P.String}

0 commit comments

Comments
 (0)