diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-05-10 15:41:41 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-05-10 15:41:41 -0400 |
commit | 246e7278f4770c87277c9e8aeedfba17547859d8 (patch) | |
tree | 7338237bc4b8400f9ad6117bcb37f5f61f6af728 /Remote | |
parent | ba1a0b2e28ceb123b8bd9d20eab3b6f1c5ea37d1 (diff) |
generalied elem/notElem in ghc 7.10 require some additional type signatures when using OverloadedStrings
Diffstat (limited to 'Remote')
-rw-r--r-- | Remote/S3.hs | 2 | ||||
-rw-r--r-- | Remote/Tahoe.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index d8914d822..b86b17d56 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -483,7 +483,7 @@ iaMunge = (>>= munge) where munge c | isAsciiUpper c || isAsciiLower c || isNumber c = [c] - | c `elem` "_-.\"" = [c] + | c `elem` ("_-.\"" :: String) = [c] | isSpace c = [] | otherwise = "&" ++ show (ord c) ++ ";" diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs index 56bf66427..bc4789e57 100644 --- a/Remote/Tahoe.hs +++ b/Remote/Tahoe.hs @@ -177,7 +177,7 @@ getSharedConvergenceSecret configdir = go (60 :: Int) v <- catchMaybeIO (readFile f) case v of Just s | "\n" `isSuffixOf` s || "\r" `isSuffixOf` s -> - return $ takeWhile (`notElem` "\n\r") s + return $ takeWhile (`notElem` ("\n\r" :: String)) s _ -> do threadDelaySeconds (Seconds 1) go (n - 1) |