on main help sign in
[#73] Bump up to GHC 8.6.5 (#74)
b0860b5Dmitrii Kovanikov
.travis.yml+2−2
@@ -16,9 +16,9 @@ matrix:
16 include:
16 include:
17 - ghc: 8.2.2
17 - ghc: 8.2.2
18 - ghc: 8.4.4
18 - ghc: 8.4.4
19− - ghc: 8.6.3
19+ - ghc: 8.6.5
20
20
21− - ghc: 8.6.4
21+ - ghc: 8.6.5
22 env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
22 env: STACK_YAML="$TRAVIS_BUILD_DIR/stack.yaml"
23
23
24install:
24install:
README.md+4−2
@@ -1,8 +1,10 @@
1# typerep-map
1# typerep-map
2
2
3![electricity](https://user-images.githubusercontent.com/8126674/44323413-788dd700-a484-11e8-842e-f224cfaa4206.png)
3![electricity](https://user-images.githubusercontent.com/8126674/44323413-788dd700-a484-11e8-842e-f224cfaa4206.png)
4−[![Hackage](https://img.shields.io/hackage/v/typerep-map.svg)](https://hackage.haskell.org/package/typerep-map)
5−[![Build status](https://secure.travis-ci.org/kowainik/typerep-map.svg)](https://travis-ci.org/kowainik/typerep-map)
4+[![Build status](https://img.shields.io/travis/kowainik/typerep-map.svg?logo=travis)](https://travis-ci.org/kowainik/typerep-map)
5+[![Hackage](https://img.shields.io/hackage/v/typerep-map.svg?logo=haskell)](https://hackage.haskell.org/package/typerep-map)
6+[![Stackage LTS](http://stackage.org/package/typerep-map/badge/lts)](http://stackage.org/lts/package/typerep-map)
7+[![Stackage Nightly](http://stackage.org/package/typerep-map/badge/nightly)](http://stackage.org/nightly/package/typerep-map)
6[![MIT license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/vrom911/typerep-map/blob/master/LICENSE)
8[![MIT license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/vrom911/typerep-map/blob/master/LICENSE)
7
9
8`typerep-map` introduces `TMap` and `TypeRepMap` — data structures like [`Map`](http://hackage.haskell.org/package/containers-0.6.0.1/docs/Data-Map-Lazy.html#t:Map), but where types serve as keys, and values have the types specified in the corresponding key spots.
10`typerep-map` introduces `TMap` and `TypeRepMap` — data structures like [`Map`](http://hackage.haskell.org/package/containers-0.6.0.1/docs/Data-Map-Lazy.html#t:Map), but where types serve as keys, and values have the types specified in the corresponding key spots.
stack.yaml+3−2
@@ -1,5 +1,6 @@
1−resolver: lts-13.14
1+resolver: lts-13.21
2
2
3extra-deps:
3extra-deps:
4 - dependent-sum-0.5
4 - dependent-sum-0.5
5+ - hedgehog-1.0
5− - tasty-hedgehog-0.2.0.0
6+ - tasty-hedgehog-1.0.0.0
test/Test/TypeRep/CMap.hs+1−1
@@ -35,7 +35,7 @@ mapOf10 = insert (Identity True)
35 $ insert (Identity $ Just ())
35 $ insert (Identity $ Just ())
36 $ insert (Identity [()])
36 $ insert (Identity [()])
37 $ insert (Identity ())
37 $ insert (Identity ())
38− $ insert (Identity "aaa")
38+ $ insert (Identity @String "aaa")
39 $ insert (Identity $ Just 'a')
39 $ insert (Identity $ Just 'a')
40 $ insert (Identity 'a')
40 $ insert (Identity 'a')
41 $ insert (Identity (11 :: Int)) empty
41 $ insert (Identity (11 :: Int)) empty
test/Test/TypeRep/CacheMap.hs+1−1
@@ -44,7 +44,7 @@ mapOf10 = insert True
44 $ insert (Just ())
44 $ insert (Just ())
45 $ insert [()]
45 $ insert [()]
46 $ insert ()
46 $ insert ()
47− $ insert "aaa"
47+ $ insert @String "aaa"
48 $ insert (Just 'a')
48 $ insert (Just 'a')
49 $ insert 'a'
49 $ insert 'a'
50 $ insert (11 :: Int) empty
50 $ insert (11 :: Int) empty
typerep-map.cabal+35−42
@@ -1,3 +1,4 @@
1+cabal-version: 2.4
1name: typerep-map
2name: typerep-map
2version: 0.3.2
3version: 0.3.2
3synopsis: Efficient implementation of a dependent map with types as keys
4synopsis: Efficient implementation of a dependent map with types as keys
@@ -20,105 +21,97 @@ homepage: https://github.com/kowainik/typerep-map
20bug-reports: https://github.com/kowainik/typerep-map/issues
21bug-reports: https://github.com/kowainik/typerep-map/issues
21license: MIT
22license: MIT
22license-file: LICENSE
23license-file: LICENSE
23−author: Kowainik, Vladislav Zavialov
24+author: Veronika Romashkina, Vladislav Zavialov, Dmitrii Kovanikov
24−maintainer: xrom.xkov@gmail.com
25+maintainer: Kowainik <xrom.xkov@gmail.com>
25copyright: 2017-2019 Kowainik
26copyright: 2017-2019 Kowainik
26category: Data, Data Structures, Types
27category: Data, Data Structures, Types
27build-type: Simple
28build-type: Simple
28extra-doc-files: README.md
29extra-doc-files: README.md
29 , CHANGELOG.md
30 , CHANGELOG.md
30−cabal-version: 2.0
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.3
33+ , GHC == 8.6.5
34
34
35source-repository head
35source-repository head
36 type: git
36 type: git
37 location: https://github.com/kowainik/typerep-map.git
37 location: https://github.com/kowainik/typerep-map.git
38
38
39+common common-options
40+ build-depends: base >= 4.10 && < 4.13
41+
42+ default-language: Haskell2010
43+ default-extensions: BangPatterns
44+ OverloadedStrings
45+ RecordWildCards
46+ ScopedTypeVariables
47+ TypeApplications
48+
39library
49library
50+ import: common-options
40 hs-source-dirs: src
51 hs-source-dirs: src
41 exposed-modules: Data.TMap
52 exposed-modules: Data.TMap
42 Data.TypeRepMap
53 Data.TypeRepMap
43 Data.TypeRepMap.Internal
54 Data.TypeRepMap.Internal
44− ghc-options: -Wall
55+
45− build-depends: base >= 4.10 && < 5
46− , containers >= 0.5.10.2 && < 0.7
56+ build-depends: containers >= 0.5.10.2 && < 0.7
47 , ghc-prim ^>= 0.5.1.1
57 , ghc-prim ^>= 0.5.1.1
48 , primitive ^>= 0.6.4
58 , primitive ^>= 0.6.4
49 , deepseq ^>= 1.4
59 , deepseq ^>= 1.4
50− default-extensions: OverloadedStrings
51− RecordWildCards
52− ScopedTypeVariables
53− TypeApplications
54− default-language: Haskell2010
55
60
56library typerep-extra-impls
61library typerep-extra-impls
62+ import: common-options
57 hs-source-dirs: typerep-extra-impls
63 hs-source-dirs: typerep-extra-impls
58 exposed-modules: Data.TypeRep.CMap
64 exposed-modules: Data.TypeRep.CMap
59 Data.TypeRep.OptimalVector
65 Data.TypeRep.OptimalVector
60 Data.TypeRep.Vector
66 Data.TypeRep.Vector
61− ghc-options: -Wall
67+
62− build-depends: base >= 4.10 && < 5
63− , containers >= 0.5.10.2 && < 0.7
68+ build-depends: containers >= 0.5.10.2 && < 0.7
64 , vector ^>= 0.12.0.1
69 , vector ^>= 0.12.0.1
65 , deepseq ^>= 1.4
70 , deepseq ^>= 1.4
66− default-extensions: OverloadedStrings
67− RecordWildCards
68− ScopedTypeVariables
69− TypeApplications
70−
71− default-language: Haskell2010
72
71
73test-suite typerep-map-test
72test-suite typerep-map-test
73+ import: common-options
74 type: exitcode-stdio-1.0
74 type: exitcode-stdio-1.0
75 hs-source-dirs: test
75 hs-source-dirs: test
76+
76 main-is: Test.hs
77 main-is: Test.hs
77 other-modules: Test.TypeRep.CMap
78 other-modules: Test.TypeRep.CMap
78 , Test.TypeRep.CacheMap
79 , Test.TypeRep.CacheMap
79 , Test.TypeRep.MapProperty
80 , Test.TypeRep.MapProperty
80 , Test.TypeRep.Vector
81 , Test.TypeRep.Vector
81 , Test.TypeRep.VectorOpt
82 , Test.TypeRep.VectorOpt
82− build-depends: base >= 4.10 && < 5
83+
84+ build-tool-depends: tasty-discover:tasty-discover
83− , ghc-typelits-knownnat >= 0.4.2 && < 0.7
85+ build-depends: ghc-typelits-knownnat >= 0.4.2 && < 0.7
84− , hedgehog >= 0.5.3 && < 0.7
86+ , hedgehog ^>= 1.0
85 , typerep-map
87 , typerep-map
86 , typerep-extra-impls
88 , typerep-extra-impls
87 , tasty >= 1.0.1.1 && < 1.3
89 , tasty >= 1.0.1.1 && < 1.3
88 , tasty-discover >= 4.1.1 && < 4.3
90 , tasty-discover >= 4.1.1 && < 4.3
89− , tasty-hedgehog >= 0.1.0.2 && < 0.3
91+ , tasty-hedgehog ^>= 1.0.0.0
90 , tasty-hspec ^>= 1.1.5
92 , tasty-hspec ^>= 1.1.5
91− , QuickCheck >= 2.11.3 && < 2.13
92− build-tool-depends: tasty-discover:tasty-discover
93− ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N
94− default-extensions: ScopedTypeVariables
95− TypeApplications
96
93
97− default-language: Haskell2010
94+ ghc-options: -threaded -rtsopts -with-rtsopts=-N
98
95
99benchmark typerep-map-benchmark
96benchmark typerep-map-benchmark
97+ import: common-options
100 type: exitcode-stdio-1.0
98 type: exitcode-stdio-1.0
101− default-language: Haskell2010
102− ghc-options: -Wall -O2 -threaded -rtsopts -with-rtsopts=-N -freduction-depth=0
103 hs-source-dirs: benchmark
99 hs-source-dirs: benchmark
100+
104 main-is: Main.hs
101 main-is: Main.hs
105 other-modules: CMap
102 other-modules: CMap
106 , CacheMap
103 , CacheMap
104+ , DMap
107 , Spec
105 , Spec
108 , Vector
106 , Vector
109 , OptimalVector
107 , OptimalVector
110− build-depends: base >= 4.10 && < 5
108+
111− , criterion >= 1.4.1.0 && < 1.6
109+ build-depends: criterion >= 1.4.1.0 && < 1.6
112 , deepseq ^>= 1.4.3.0
110 , deepseq ^>= 1.4.3.0
113 , dependent-map >= 0.2.4.0 && < 0.5
111 , dependent-map >= 0.2.4.0 && < 0.5
114 , dependent-sum ^>= 0.5
112 , dependent-sum ^>= 0.5
115 , ghc-typelits-knownnat >= 0.4.2 && < 0.7
113 , ghc-typelits-knownnat >= 0.4.2 && < 0.7
116 , typerep-map
114 , typerep-map
117 , typerep-extra-impls
115 , typerep-extra-impls
118− default-extensions: OverloadedStrings
116+
119− RecordWildCards
117+ ghc-options: -O2 -threaded -rtsopts -with-rtsopts=-N -freduction-depth=0
120− ScopedTypeVariables
121− TypeApplications
122− BangPatterns
123− if impl(ghc >= 8.2.2)
124− other-modules: DMap