fb3ffb3 · obelisk · git.iko.soy

git.iko.soy/obelisk

Clean up warnings in obelisk libs

commitfb3ffb3919e7f0c855e80e3014e916a395069f7c authorElliot Cameron <eacameron@gmail.com> dateFri 24 Jan 2020, 00:36 (7 years ago) parent323e52e

4 files changed+8−16

compare with master

unifiedsplit

lib/asset/serve-snap/src/Obelisk/Asset/Accept.hs+6−6 lib/executable-config/lookup/src-other/Obelisk/ExecutableConfig/Lookup.hs+1−8 lib/frontend/src/Obelisk/Frontend.hs−1 lib/snap-extras/src/Obelisk/Snap/Extras.hs+1−1

lib/asset/serve-snap/src/Obelisk/Asset/Accept.hs+6−6

@@ -136,16 +136,16 @@ qvalue = do

136136 skipMany lws

137137 q0 <|> q1

138138 where q0 = do

139− char '0'

139+ _ <- char '0'

140140 decimals <- option [] $ do

141− char '.'

141+ _ <- char '.'

142142 starRule (Just 0) (Just numAllowedDigits) digit

143143 return $ QValue $ MkFixed $ fromIntegral $ (read ('0' : decimals) :: Int) * 10 ^ (numAllowedDigits - length decimals)

144144 q1 = do

145− char '1'

145+ _ <- char '1'

146146 option () $ do

147− char '.'

148− starRule (Just 0) (Just numAllowedDigits) $ char '0'

147+ _ <- char '.'

148+ _ <- starRule (Just 0) (Just numAllowedDigits) $ char '0'

149149 return ()

150150 return $ QValue 1

151151 numAllowedDigits :: Int

@@ -232,7 +232,7 @@ hashRule minNum maxNum element = do

232232lws :: Parser ()

233233lws = do

234234 option () $ cr >> lf

235− starRule (Just 1) Nothing $ sp <|> ht

235+ _ <- starRule (Just 1) Nothing $ sp <|> ht

236236 return ()

237237

238238-- | See http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2

lib/executable-config/lookup/src-other/Obelisk/ExecutableConfig/Lookup.hs+1−8

@@ -1,18 +1,11 @@

1−{-# LANGUAGE LambdaCase #-}

21{-# LANGUAGE OverloadedStrings #-}

32module Obelisk.ExecutableConfig.Lookup where

54import Data.Map (Map)

6−import qualified Data.Map as Map

75import Data.Text (Text)

8−import qualified Data.Text as T

96import Data.ByteString (ByteString)

10−import qualified Data.ByteString as BS

11−import System.Directory

12−import System.FilePath

13−import Control.Monad

147

15−import Obelisk.Configs.Internal.Directory

8+import Obelisk.Configs.Internal.Directory (getConfigsFromDirectory)

169

1710getConfigs :: IO (Map Text ByteString)

1811getConfigs = getConfigsFromDirectory "config"

lib/frontend/src/Obelisk/Frontend.hs−1

@@ -198,7 +198,6 @@ runFrontendWithConfigsAndCurrentRoute mode configs validFullEncoder frontend = d

198198 , PrimMonad m

199199 , MonadSample DomTimeline (Performable m)

200200 , DOM.MonadJSM m

201− , Monad (Performable (Client (HydrationDomBuilderT s DomTimeline m)))

202201 , MonadFix (Client (HydrationDomBuilderT s DomTimeline m))

203202 , MonadFix (Performable m)

204203 , MonadFix m

lib/snap-extras/src/Obelisk/Snap/Extras.hs+1−1

@@ -2,13 +2,13 @@

22module Obelisk.Snap.Extras

33 ( cachePermanently

44 , doNotCache

5+ , ensureSecure

56 , serveFileIfExists

67 , serveFileIfExistsAs

78 ) where

910import Control.Monad.IO.Class

1011import Data.ByteString (ByteString)

11−import Data.Monoid

1212import Data.String

1313import Snap.Core

1414import Snap.Util.FileServe