From 0a1752c44751793227f1d8e33c30d0c3431caed6 Mon Sep 17 00:00:00 2001 From: Jens Nolte <jens@nightmarestudio.de> Date: Fri, 13 Mar 2020 02:02:01 +0100 Subject: [PATCH] Apply some hlint suggestions --- src/QBar/ControlSocket.hs | 2 +- src/QBar/DefaultConfig.hs | 2 +- src/QBar/TagParser.hs | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/QBar/ControlSocket.hs b/src/QBar/ControlSocket.hs index 56e5ab1..6a6328b 100644 --- a/src/QBar/ControlSocket.hs +++ b/src/QBar/ControlSocket.hs @@ -55,7 +55,7 @@ class (ToJSON (Up s), FromJSON (Up s), ToJSON (Down s), FromJSON (Down s)) => Is return (up, down) where verbosePrintP :: Pipe ByteString ByteString IO () - verbosePrintP = if verbose then (PP.chain $ BSC.hPutStrLn stderr) else cat + verbosePrintP = if verbose then PP.chain $ BSC.hPutStrLn stderr else cat handleByteStream :: s -> MainOptions -> Producer ByteString IO () -> Consumer ByteString IO () -> BarIO () handleByteStream s options up down = do (handleUp, handleDown, cleanup) <- streamHandler s diff --git a/src/QBar/DefaultConfig.hs b/src/QBar/DefaultConfig.hs index 6fd5c84..ff9fa26 100644 --- a/src/QBar/DefaultConfig.hs +++ b/src/QBar/DefaultConfig.hs @@ -21,7 +21,7 @@ legacyBarConfig :: BarIO () legacyBarConfig = do let todo = pollScriptBlock $ blockLocation "todo" let networkEnvironment = pollScriptBlock $ blockLocation "network-environment" - let ram = (pollScriptBlock $ blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding + let ram = pollScriptBlock (blockLocation "memory") >-> modify (addIcon "ðŸ\xFE0E") >-> autoPadding let temperature = (pollScriptBlock $ blockLocation "temperature") >-> autoPadding let volumeBlock = scriptBlock $ blockLocation "volume-pulseaudio -S -F3" diff --git a/src/QBar/TagParser.hs b/src/QBar/TagParser.hs index 75c1127..8a9ea14 100644 --- a/src/QBar/TagParser.hs +++ b/src/QBar/TagParser.hs @@ -55,7 +55,7 @@ tagParser = parser (False, normalImportant) let background = listToMaybe . catMaybes $ backgrounds void $ char '>' content <- T.fromStrict <$> A.takeWhile1 (notInClass "<>") - void $ string $ "</span>" + void $ string "</span>" return $ mkStyledText color background content where colorAttributeParser :: Text -> Parser Color @@ -65,11 +65,8 @@ tagParser = parser (False, normalImportant) skipSpace void $ char '=' skipSpace - value <- ( - char '\'' *> colorParser <* char '\'' - <|> char '"' *> colorParser <* char '"' - ) - return value + char '\'' *> colorParser <* char '\'' <|> + char '"' *> colorParser <* char '"' colorAttribute :: Parser (Maybe Color, Maybe Color) colorAttribute = do -- GitLab