summaryrefslogtreecommitdiffhomepage
path: root/src/Environment.hs
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2016-07-27 01:05:40 +0200
committerjao <jao@gnu.org>2016-07-27 01:05:40 +0200
commit72143cb38608bb48f8d7de5f25687bc4368f550e (patch)
treefb5f9508f5012b43ce790246550e5e7be2addabe /src/Environment.hs
parenta93755b2d1e9efbd63723f5302ca7c8f43521aa8 (diff)
downloadxmobar-72143cb38608bb48f8d7de5f25687bc4368f550e.tar.gz
xmobar-72143cb38608bb48f8d7de5f25687bc4368f550e.tar.bz2
Trivial fixes for compiler warnings
Diffstat (limited to 'src/Environment.hs')
-rw-r--r--src/Environment.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Environment.hs b/src/Environment.hs
index ebdf733..f0edece 100644
--- a/src/Environment.hs
+++ b/src/Environment.hs
@@ -25,8 +25,8 @@ expandEnv (c:s) = case c of
return $ envVar ++ remainder
where (e, s') = getVar s
getVar "" = ("", "")
- getVar ('{':s) = (takeUntil "}" s, drop 1 . dropUntil "}" $ s)
- getVar s = (takeUntil filterstr s, dropUntil filterstr s)
+ getVar ('{':s'') = (takeUntil "}" s'', drop 1 . dropUntil "}" $ s'')
+ getVar s'' = (takeUntil filterstr s'', dropUntil filterstr s'')
filterstr = ",./? \t;:\"'~`!@#$%^&*()<>-+=\\|"
takeUntil f = takeWhile (not . flip elem f)
dropUntil f = dropWhile (not . flip elem f)
@@ -36,7 +36,7 @@ expandEnv (c:s) = case c of
False -> do
remainder <- expandEnv $ drop 1 s
return $ escString s ++ remainder
- where escString s = let (cc:ss) = s in
+ where escString s' = let (cc:ss) = s' in
case cc of
't' -> "\t"
'n' -> "\n"