git.iko.soy/typerep-map
on main help sign in
Support ghc-8.8.1 (#79)
9e1c7c6Brandon Hamilton
.travis.yml+6−5
compare with main
unifiedsplit
@@ -4,7 +4,7 @@ language: haskell
4git:
4git:
5 depth: 5
5 depth: 5
6
6
7−cabal: "2.4"
7+cabal: "3.0"
8
8
9cache:
9cache:
10 directories:
10 directories:
@@ -17,15 +17,16 @@ matrix:
17 - ghc: 8.2.2
17 - ghc: 8.2.2
18 - ghc: 8.4.4
18 - ghc: 8.4.4
19 - ghc: 8.6.5
19 - ghc: 8.6.5
20+ - ghc: 8.8.1
20
21
21− - ghc: 8.6.5
22+ - ghc: 8.8.1
22 env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
23 env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
23
24
24install:
25install:
25 - |
26 - |
26 if [ -z "$STACK_YAML" ]; then
27 if [ -z "$STACK_YAML" ]; then
27− cabal new-update
28+ cabal update
28− cabal new-build --enable-tests --enable-benchmarks
29+ cabal build --enable-tests --enable-benchmarks
29 else
30 else
30 curl -sSL https://get.haskellstack.org/ | sh
31 curl -sSL https://get.haskellstack.org/ | sh
31 stack --version
32 stack --version
@@ -35,7 +36,7 @@ install:
35script:
36script:
36 - |
37 - |
37 if [ -z "$STACK_YAML" ]; then
38 if [ -z "$STACK_YAML" ]; then
38− cabal new-test --enable-tests
39+ cabal test --enable-tests
39 else
40 else
40 stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror
41 stack build --system-ghc --test --bench --no-run-benchmarks --no-terminal --ghc-options=-Werror
41 fi
42 fi
stack.yaml+2−6
@@ -1,9 +1,5 @@
1−resolver: lts-13.26
1+resolver: nightly-2019-09-30
2
2
3extra-deps:
3extra-deps:
4− - aeson-1.4.4.0
4+ - dependent-map-0.2.4.0
5 - dependent-sum-0.5
5 - dependent-sum-0.5
6− - hedgehog-1.0
7− - primitive-0.7.0.0
8− - tasty-hedgehog-1.0.0.1
9− - time-compat-1.9.2.2
test/Test/TypeRep/MapProperty.hs+2−2
@@ -83,7 +83,7 @@ test_DeleteInvariant = prop "invariantCheck (delete k b) == True" $ do
83-- it doesn't compare values so it's not true equality. But this should be
83-- it doesn't compare values so it's not true equality. But this should be
84-- enough for tests.
84-- enough for tests.
85newtype FpMap f = FpMap (TypeRepMap f)
85newtype FpMap f = FpMap (TypeRepMap f)
86− deriving (Show, Semigroup, Monoid)
86+ deriving newtype (Show, Semigroup, Monoid)
87
87
88instance Eq (FpMap f) where
88instance Eq (FpMap f) where
89 FpMap (TypeRepMap as1 bs1 _ _) == FpMap (TypeRepMap as2 bs2 _ _) =
89 FpMap (TypeRepMap as1 bs1 _ _) == FpMap (TypeRepMap as2 bs2 _ _) =
@@ -120,7 +120,7 @@ test_MonoidIdentity = prop "x <> mempty == mempty <> x == x" $ do
120----------------------------------------------------------------------------
120----------------------------------------------------------------------------
121
121
122data IntProxy (n :: Nat) = IntProxy (Proxy n) Int
122data IntProxy (n :: Nat) = IntProxy (Proxy n) Int
123− deriving (Show, Eq)
123+ deriving stock (Show, Eq)
124
124
125genMap :: MonadGen m => m (TypeRepMap IntProxy)
125genMap :: MonadGen m => m (TypeRepMap IntProxy)
126genMap = fromList <$> Gen.list (Range.linear 0 1000) genTF
126genMap = fromList <$> Gen.list (Range.linear 0 1000) genTF
typerep-map.cabal+7−3
@@ -31,20 +31,24 @@ extra-doc-files: README.md
31tested-with: GHC == 8.2.2
31tested-with: GHC == 8.2.2
32 , GHC == 8.4.4
32 , GHC == 8.4.4
33 , GHC == 8.6.5
33 , GHC == 8.6.5
34+ , GHC == 8.8.1
34
35
35source-repository head
36source-repository head
36 type: git
37 type: git
37 location: https://github.com/kowainik/typerep-map.git
38 location: https://github.com/kowainik/typerep-map.git
38
39
39common common-options
40common common-options
40− build-depends: base >= 4.10 && < 4.13
41+ build-depends: base >= 4.10 && < 4.14
41
42
42 default-language: Haskell2010
43 default-language: Haskell2010
43 default-extensions: BangPatterns
44 default-extensions: BangPatterns
45+ DerivingStrategies
44 OverloadedStrings
46 OverloadedStrings
45 RecordWildCards
47 RecordWildCards
46 ScopedTypeVariables
48 ScopedTypeVariables
47 TypeApplications
49 TypeApplications
50+ if impl(ghc >= 8.8.1)
51+ ghc-options: -Wmissing-deriving-strategies
48
52
49library
53library
50 import: common-options
54 import: common-options
@@ -82,7 +86,7 @@ test-suite typerep-map-test
82 , Test.TypeRep.VectorOpt
86 , Test.TypeRep.VectorOpt
83
87
84 build-tool-depends: tasty-discover:tasty-discover
88 build-tool-depends: tasty-discover:tasty-discover
85− build-depends: ghc-typelits-knownnat >= 0.4.2 && < 0.7
89+ build-depends: ghc-typelits-knownnat >= 0.4.2 && < 0.8
86 , hedgehog ^>= 1.0
90 , hedgehog ^>= 1.0
87 , typerep-map
91 , typerep-map
88 , typerep-extra-impls
92 , typerep-extra-impls
@@ -110,7 +114,7 @@ benchmark typerep-map-benchmark
110 , deepseq ^>= 1.4.3.0
114 , deepseq ^>= 1.4.3.0
111 , dependent-map >= 0.2.4.0 && < 0.5
115 , dependent-map >= 0.2.4.0 && < 0.5
112 , dependent-sum ^>= 0.5
116 , dependent-sum ^>= 0.5
113− , ghc-typelits-knownnat >= 0.4.2 && < 0.7
117+ , ghc-typelits-knownnat >= 0.4.2 && < 0.8
114 , typerep-map
118 , typerep-map
115 , typerep-extra-impls
119 , typerep-extra-impls
116
120