summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-06 01:18:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-06 01:18:22 -0400
commit8beaba5bff7a34ee654006247271a99b86e55dca (patch)
tree057c1caacf1ce6e7adab17c55a9449a9cf5c7f69
parent821debc213a925e8f7d23246461b793eccb28e5c (diff)
use pure or return rather than (:[]) or \x -> [x]
-rw-r--r--Build/EvilSplicer.hs2
-rw-r--r--Build/OSXMkLibs.hs2
2 files changed, 2 insertions, 2 deletions
diff --git a/Build/EvilSplicer.hs b/Build/EvilSplicer.hs
index f40d10033..35dba4968 100644
--- a/Build/EvilSplicer.hs
+++ b/Build/EvilSplicer.hs
@@ -584,7 +584,7 @@ text_builder_hack = replace "Data.Text.Lazy.Builder.Internal.fromText" "Data.Tex
parsecAndReplace :: Parser String -> String -> String
parsecAndReplace p s = case parse find "" s of
Left e -> s
- Right l -> concatMap (either (\c -> [c]) id) l
+ Right l -> concatMap (either return id) l
where
find :: Parser [Either Char String]
find = many $ try (Right <$> p) <|> (Left <$> anyChar)
diff --git a/Build/OSXMkLibs.hs b/Build/OSXMkLibs.hs
index ed12a945f..dae9bc0ae 100644
--- a/Build/OSXMkLibs.hs
+++ b/Build/OSXMkLibs.hs
@@ -144,7 +144,7 @@ getLibName lib libmap = case M.lookup lib libmap of
Just n -> (n, libmap)
Nothing -> (nextfreename, M.insert lib nextfreename libmap)
where
- names = map (\c -> [c]) ['A' .. 'Z'] ++
+ names = map pure ['A' .. 'Z'] ++
[[n, l] | n <- ['0' .. '9'], l <- ['A' .. 'Z']]
used = S.fromList $ M.elems libmap
nextfreename = fromMaybe (error "ran out of short library names!") $