Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
50e7bff7
Commit
50e7bff7
authored
Jun 18, 2018
by
Ben Gamari
🐢
Browse files
containers: Bump to 0.6.0.1
Bumps containers submodule, among others.
parent
000ac86c
Changes
16
Hide whitespace changes
Inline
Side-by-side
compiler/ghc.cabal.in
View file @
50e7bff7
...
...
@@ -56,7 +56,7 @@ Library
bytestring >= 0.9 && < 0.11,
binary == 0.8.*,
time >= 1.4 && < 1.9,
containers >= 0.5 && < 0.
6
,
containers >= 0.5 && < 0.
7
,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
template-haskell == 2.14.*,
...
...
ghc/ghc-bin.cabal.in
View file @
50e7bff7
...
...
@@ -52,7 +52,7 @@ Executable ghc
if flag(ghci)
-- NB: this is never built by the bootstrapping GHC+libraries
Build-depends:
containers
=
= 0.5
.*
,
containers
>
= 0.5
&& < 0.7
,
deepseq == 1.4.*,
ghci == @ProjectVersionMunged@,
haskeline == 0.7.*,
...
...
Cabal
@
8fbacca0
Compare
b8c4ce3d
...
8fbacca0
Subproject commit
b8c4ce3dacece1b1ac68360b48a3129d9ca440c1
Subproject commit
8fbacca029f3ad764576aefb610a0408c4b6aaad
containers
@
e5b3bbae
Compare
a57e7dd0
...
e5b3bbae
Subproject commit
a57e7dd0c0aa6a719a73085ae30edef8206ccea0
Subproject commit
e5b3bbaeb79cbf3a2c99bd14257d4199cc651b73
libraries/ghci/ghci.cabal.in
View file @
50e7bff7
...
...
@@ -72,7 +72,7 @@ library
base >= 4.8 && < 4.13,
binary == 0.8.*,
bytestring == 0.10.*,
containers
=
= 0.5
.*
,
containers
>
= 0.5
&& < 0.7
,
deepseq == 1.4.*,
filepath == 1.4.*,
ghc-boot == @ProjectVersionMunged@,
...
...
hpc
@
85e04edd
Compare
91f520cb
...
85e04edd
Subproject commit
91f520cb9725d812fa93b57bca1d8dbd72c88dd5
Subproject commit
85e04edd6e29de549301cf10d2c725cbf29b2098
libraries/libiserv/libiserv.cabal
View file @
50e7bff7
...
...
@@ -23,7 +23,7 @@ Library
Build-Depends: base >= 4 && < 5,
binary >= 0.7 && < 0.9,
bytestring >= 0.10 && < 0.11,
containers >= 0.5 && < 0.
6
,
containers >= 0.5 && < 0.
7
,
deepseq >= 1.4 && < 1.5,
ghci == 8.6.*
if flag(network)
...
...
parallel
@
41279a76
Compare
d08911d1
...
41279a76
Subproject commit
d08911d1748b0c6bd0dbde282acc164c94bb0d83
Subproject commit
41279a764acd0758f15801c10650d73343637451
testsuite/tests/backpack/should_run/bkprun05.bkp
View file @
50e7bff7
...
...
@@ -53,8 +53,8 @@ unit app where
union :: Ord k => Map k a -> Map k a -> Map k a
unionWith :: Ord k => (a -> a -> a) -> Map k a -> Map k a -> Map k a
unionWithKey :: Ord k => (k -> a -> a -> a) -> Map k a -> Map k a -> Map k a
unions :: Ord k =>
[
Map k a
]
-> Map k a
unionsWith :: Ord k => (a -> a -> a) ->
[
Map k a
]
-> Map k a
unions ::
(Foldable f,
Ord k
)
=>
f (
Map k a
)
-> Map k a
unionsWith ::
(Foldable f,
Ord k
)
=> (a -> a -> a) ->
f (
Map k a
)
-> Map k a
difference :: Ord k => Map k a -> Map k b -> Map k a
differenceWith :: Ord k => (a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
differenceWithKey :: Ord k => (k -> a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
...
...
@@ -127,8 +127,6 @@ unit app where
maxView :: Map k a -> Maybe (a, Map k a)
minViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
maxViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
showTree :: (Show k, Show a) => Map k a -> String
showTreeWith :: (k -> a -> String) -> Bool -> Bool -> Map k a -> String
valid :: Ord k => Map k a -> Bool
module App where
import Map
...
...
testsuite/tests/backpack/should_run/bkprun05.stderr
View file @
50e7bff7
bkprun05: Prelude.undefined
CallStack (from HasCallStack):
error, called at libraries/base/GHC/Err.hs:7
9
:14 in base:GHC.Err
undefined, called at bkprun05.bkp:13
8
:30 in app+app-
0UPCJKIsbig160BXB4AqAb
:App
error, called at libraries/base/GHC/Err.hs:7
8
:14 in base:GHC.Err
undefined, called at bkprun05.bkp:13
6
:30 in app+app-
18HBpsO5TPxCVSTvBQxSrq
:App
testsuite/tests/backpack/should_run/bkprun06.bkp
View file @
50e7bff7
...
...
@@ -53,8 +53,8 @@ unit sigs where
union :: Ord k => Map k a -> Map k a -> Map k a
unionWith :: Ord k => (a -> a -> a) -> Map k a -> Map k a -> Map k a
unionWithKey :: Ord k => (k -> a -> a -> a) -> Map k a -> Map k a -> Map k a
unions :: Ord k =>
[
Map k a
]
-> Map k a
unionsWith :: Ord k => (a -> a -> a) ->
[
Map k a
]
-> Map k a
unions ::
(Foldable f,
Ord k
)
=>
f (
Map k a
)
-> Map k a
unionsWith ::
(Foldable f,
Ord k
)
=> (a -> a -> a) ->
f (
Map k a
)
-> Map k a
difference :: Ord k => Map k a -> Map k b -> Map k a
differenceWith :: Ord k => (a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
differenceWithKey :: Ord k => (k -> a -> b -> Maybe a) -> Map k a -> Map k b -> Map k a
...
...
@@ -127,8 +127,6 @@ unit sigs where
maxView :: Map k a -> Maybe (a, Map k a)
minViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
maxViewWithKey :: Map k a -> Maybe ((k, a), Map k a)
showTree :: (Show k, Show a) => Map k a -> String
showTreeWith :: (k -> a -> String) -> Bool -> Bool -> Map k a -> String
valid :: Ord k => Map k a -> Bool
signature MapAsSet where
...
...
testsuite/tests/driver/T10970.stdout
View file @
50e7bff7
0.
5.11.0
0.
6.0.1
OK
testsuite/tests/package/all.T
View file @
50e7bff7
...
...
@@ -6,7 +6,7 @@ inc_ghc = '-package ghc '
hide_ghc
=
'
-hide-package ghc
'
test
('
package01
',
normal
,
compile
,
[
hide_all
+
incr_containers
])
test
('
package01e
',
normal
,
compile_fail
,
[
hide_all
+
incr_containers
])
test
('
package01e
',
normal
ise_version
('
containers
')
,
compile_fail
,
[
hide_all
+
incr_containers
])
test
('
package02
',
normal
,
compile
,
[
hide_all
+
inc_containers
+
incr_containers
])
test
('
package03
',
normal
,
compile
,
[
hide_all
+
incr_containers
+
inc_containers
])
test
('
package04
',
normal
,
compile
,
[
incr_containers
])
...
...
@@ -18,5 +18,5 @@ test('package08e', normalise_version('ghc'), compile_fail, [incr_ghc + hide_ghc]
test
('
package09e
',
normal
,
compile_fail
,
['
-package "containers (Data.Map as M, Data.Set as M)"
'])
test
('
package10
',
normal
,
compile
,
['
-hide-all-packages -package "ghc (UniqFM as Prelude)"
'])
test
('
T4806
',
normal
,
compile_fail
,
['
-ignore-package containers
'])
test
('
T4806a
',
normal
,
compile_fail
,
['
-ignore-package deepseq
'])
\ No newline at end of file
test
('
T4806
',
normalise_version
('
containers
'),
compile_fail
,
['
-ignore-package containers
'])
test
('
T4806a
',
normalise_version
('
containers
'),
compile_fail
,
['
-ignore-package deepseq
'])
utils/hpc/hpc-bin.cabal
View file @
50e7bff7
...
...
@@ -31,7 +31,7 @@ Executable hpc
Build-Depends: base >= 4 && < 5,
directory >= 1 && < 1.4,
filepath >= 1 && < 1.5,
containers >= 0.1 && < 0.
6
,
containers >= 0.1 && < 0.
7
,
array >= 0.1 && < 0.6,
hpc
hsc2hs
@
6b6938db
Compare
b8588039
...
6b6938db
Subproject commit
b8588039f3810e2d0f52e9afdb15998992ee38b1
Subproject commit
6b6938db11a33904bb6ba90d70d89df4b72a7f90
utils/iserv/iserv.cabal
View file @
50e7bff7
...
...
@@ -33,7 +33,7 @@ Executable iserv
base >= 4 && < 5,
binary >= 0.7 && < 0.9,
bytestring >= 0.10 && < 0.11,
containers >= 0.5 && < 0.
6
,
containers >= 0.5 && < 0.
7
,
deepseq >= 1.4 && < 1.5,
ghci == 8.6.*,
libiserv == 8.6.*
...
...
Administrator
@root
mentioned in commit
7363ba45
·
Dec 17, 2018
mentioned in commit
7363ba45
mentioned in commit 7363ba4561d4c224efd73542e1e3f7fd524e6d6d
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment