git.iko.soy/obelisk
on master help sign in
Import liftIO from Control.Monad.IO.Class
commit3ca76df6b68a807e1e81440ebb182f9b3c6f2dd8 authorSridhar Ratnakumar <srid@srid.ca> dateFri 11 May 2018, 18:47 (8 years ago) parent9f5ba91
5 files changed+8−6
compare with master
unifiedsplit
lib/command/src/Obelisk/Command.hs+2−1 lib/command/src/Obelisk/Command/CLI.hs+3−2 lib/command/src/Obelisk/Command/Deploy.hs+1−1 lib/command/src/Obelisk/Command/Nix.hs+1−1 lib/command/src/Obelisk/Command/Project.hs+1−1
lib/command/src/Obelisk/Command.hs+2−1
@@ -8,7 +8,8 @@
88module Obelisk.Command where
99
1010import Control.Monad
11−import Control.Monad.Reader (liftIO, runReaderT)
11+import Control.Monad.IO.Class (liftIO)
12+import Control.Monad.Reader (runReaderT)
1213import qualified Data.Binary as Binary
1314import qualified Data.ByteString.Base16 as Base16
1415import qualified Data.ByteString.Lazy as LBS
lib/command/src/Obelisk/Command/CLI.hs+3−2
@@ -4,7 +4,8 @@
44module Obelisk.Command.CLI where
55
66import Control.Monad.Catch (MonadThrow, finally, throwM)
7−import Control.Monad.Reader (MonadIO, liftIO, reader)
7+import Control.Monad.IO.Class (liftIO)
8+import Control.Monad.Reader (MonadIO, asks)
89import Data.List (isInfixOf)
910import Data.Text (Text)
1011import qualified Data.Text as T
@@ -29,7 +30,7 @@ withSpinner
2930 -> m a -- ^ Action to run and wait for
3031 -> m a
3132withSpinner s e f = do
32− verbose <- reader _obelisk_verbose
33+ verbose <- asks _obelisk_verbose
3334 isTerm <- liftIO $ hIsTerminalDevice stdout
3435 -- When running in shell completion, disable the spinner.
3536 inBashCompletion <- liftIO $ isInfixOf "completion" . unwords <$> getArgs
lib/command/src/Obelisk/Command/Deploy.hs+1−1
@@ -6,7 +6,7 @@ module Obelisk.Command.Deploy where
66
77import Control.Monad
88import Control.Monad.Catch (finally)
9−import Control.Monad.Reader (liftIO)
9+import Control.Monad.IO.Class (liftIO)
1010import Data.Default
1111import Data.Maybe
1212import Data.Monoid
lib/command/src/Obelisk/Command/Nix.hs+1−1
@@ -11,7 +11,7 @@ module Obelisk.Command.Nix
1111 , Arg (..)
1212 ) where
1313
14−import Control.Monad.Reader (liftIO)
14+import Control.Monad.IO.Class (liftIO)
1515import qualified Data.ByteString.Lazy as LBS
1616import Data.Default
1717import Data.Monoid ((<>))
lib/command/src/Obelisk/Command/Project.hs+1−1
@@ -13,7 +13,7 @@ module Obelisk.Command.Project
1313 ) where
1414
1515import Control.Monad
16−import Control.Monad.Reader (liftIO)
16+import Control.Monad.IO.Class (liftIO)
1717import Control.Monad.Trans.State
1818import Data.Bits
1919import Data.Function (on)