Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sync with obelisk/develop #6

Merged
merged 10 commits into from Jul 21, 2022
Merged

Sync with obelisk/develop #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7a81d23
Sync with obelisk/develop
romefeller Jul 14, 2022
03aa798
use ExitCode instead of ints
plt-amy Jul 18, 2022
0699155
Haddock clean-up
plt-amy Jul 18, 2022
80a8f44
haddock for newCliConfig
plt-amy Jul 18, 2022
008bac5
build on GHC 8.6.5 too
plt-amy Jul 18, 2022
d9bf90e
clarify comment for putLog
plt-amy Jul 18, 2022
867aa09
Merge remote-tracking branch 'origin/develop' into ago@sync
plt-amy Jul 18, 2022
0531557
add utf8-string & shell-escape to cabal file
plt-amy Jul 18, 2022
fe44b28
Remove x-revision field from Cabal file
plt-amy Jul 19, 2022
8954cb7
relax utf8-string bound
plt-amy Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Cli/Extras/Process.hs
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE CPP #-}

-- | An extension of `System.Process` that integrates with logging (`Obelisk.CLI.Logging`)
-- and is thus spinner friendly.
Expand Down Expand Up @@ -61,6 +62,10 @@ import Control.Monad.Log (Severity (..))
import Cli.Extras.Logging (putLog, putLogRaw)
import Cli.Extras.Types (CliLog, CliThrow)

#if !(MIN_VERSION_base(4, 13, 0))
import Control.Monad.Fail (MonadFail)
#endif
Comment on lines +65 to +67
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@madeline-os should I use these CPP guards to only import MonadFail when needed, should I disable the "redundant imports" warning, or should I just leave the warning there?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Go for CPP guards, or just leave the warning in there if it already exists.


data ProcessSpec = ProcessSpec
{ _processSpec_createProcess :: !CreateProcess
, _processSpec_overrideEnv :: !(Maybe (Map String String -> Map String String))
Expand Down
4 changes: 4 additions & 0 deletions src/Cli/Extras/SubExcept.hs
View file
Open in desktop
Expand Up @@ -8,12 +8,16 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE CPP #-}
module Cli.Extras.SubExcept where

import Control.Lens (Prism', preview, review)
import Control.Monad.Error.Class (MonadError (..))
import Control.Monad.Reader
import Control.Monad.Catch (MonadThrow, MonadCatch, MonadMask)
#if !(MIN_VERSION_base(4, 13, 0))
import Control.Monad.Fail (MonadFail)
#endif
import Control.Monad.Log

-- | Wrap a Prism' in a newtype to avoid impredicativity problems
Expand Down
5 changes: 5 additions & 0 deletions src/Cli/Extras/Types.hs
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE CPP #-}
module Cli.Extras.Types where

import Control.Concurrent.MVar (MVar)
Expand All @@ -26,6 +27,10 @@ import System.Exit (ExitCode (..), exitWith)
import Cli.Extras.TerminalString (TerminalString)
import Cli.Extras.Theme (CliTheme)

#if !(MIN_VERSION_base(4, 13, 0))
import Control.Monad.Fail (MonadFail)
#endif

--------------------------------------------------------------------------------

data Output
Expand Down