Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build with GHC 6.12 #1154

Merged
merged 1 commit into from
Dec 18, 2012
Merged

Fix build with GHC 6.12 #1154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Library
filepath >= 1 && < 1.4,
directory >= 1 && < 1.3,
process >= 1 && < 1.2,
time >= 1.4 && < 1.5,
time >= 1.1 && < 1.5,
containers >= 0.1 && < 0.6,
array >= 0.1 && < 0.5,
pretty >= 1 && < 1.2,
Expand Down
5 changes: 1 addition & 4 deletions Cabal/Distribution/Simple/BuildTarget.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ import Data.Maybe
import Data.Either
( partitionEithers )
import qualified Data.Map as Map
import Data.Map (Map)
import Control.Monad
import qualified Distribution.Compat.ReadP as Parse
import Distribution.Compat.ReadP
Expand Down Expand Up @@ -884,7 +883,7 @@ matchExactly xs =
-- function, then we would get case insensitive matching (but it will still
-- report an exact match when the case matches too).
--
matchInexactly :: forall a a' b. (Ord a, Ord a') =>
matchInexactly :: (Ord a, Ord a') =>
(a -> a') ->
[(a, b)] -> (a -> Match b)
matchInexactly cannonicalise xs =
Expand All @@ -894,11 +893,9 @@ matchInexactly cannonicalise xs =
Just ys -> inexactMatches ys
Nothing -> matchZero
where
m :: Ord a => Map a [b]
m = Map.fromListWith (++) [ (k,[x]) | (k,x) <- xs ]

-- the map of canonicalised keys to groups of inexact matches
m' :: Ord a' => Map a' [b]
m' = Map.mapKeysWith (++) cannonicalise m


Expand Down