mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

generalied elem/notElem in ghc 7.10 require some additional type signatures when using OverloadedStrings

Browse source
This commit is contained in:
Joey Hess 2015-05-10 15:41:41 -04:00
commit 9f14f51d63
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/S3.hs
View file

@ -483,7 +483,7 @@ iaMunge = (>>= munge)
where where
munge c munge c
| isAsciiUpper c || isAsciiLower c || isNumber c = [c] | isAsciiUpper c || isAsciiLower c || isNumber c = [c]
| c `elem` "_-.\"" = [c] | c `elem` ("_-.\"" :: String) = [c]
| isSpace c = [] | isSpace c = []
| otherwise = "&" ++ show (ord c) ++ ";" | otherwise = "&" ++ show (ord c) ++ ";"

2
Remote/Tahoe.hs
View file

@ -177,7 +177,7 @@ getSharedConvergenceSecret configdir = go (60 :: Int)
v <- catchMaybeIO (readFile f) v <- catchMaybeIO (readFile f)
case v of case v of
Just s | "\n" `isSuffixOf` s || "\r" `isSuffixOf` s -> Just s | "\n" `isSuffixOf` s || "\r" `isSuffixOf` s ->
return $ takeWhile (`notElem` "\n\r") s return $ takeWhile (`notElem` ("\n\r" :: String)) s
_ -> do _ -> do
threadDelaySeconds (Seconds 1) threadDelaySeconds (Seconds 1)
go (n - 1) go (n - 1)