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

Remove CradleOpt type #293

Merged
merged 3 commits into from
Apr 14, 2021
Merged

Remove CradleOpt type #293

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dec484
Remove unused CradleOpts type
masaeedu Apr 14, 2021
50b5921
Remove now redundant copy of loadCradleWithOpts
masaeedu Apr 14, 2021
91dec1c
Bump A.>B<.C to track removal of type
masaeedu Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions src/HIE/Bios/Cradle.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
module HIE.Bios.Cradle (
findCradle
, loadCradle
, loadCustomCradle
, loadImplicitCradle
, yamlConfig
, defaultCradle
Expand Down Expand Up @@ -74,10 +73,7 @@ findCradle wfile = do

-- | Given root\/hie.yaml load the Cradle.
loadCradle :: FilePath -> IO (Cradle Void)
loadCradle = loadCradleWithOpts Types.defaultCradleOpts absurd

loadCustomCradle :: Yaml.FromJSON b => (b -> Cradle a) -> FilePath -> IO (Cradle a)
loadCustomCradle = loadCradleWithOpts Types.defaultCradleOpts
loadCradle = loadCradleWithOpts absurd

-- | Given root\/foo\/bar.hs, load an implicit cradle
loadImplicitCradle :: Show a => FilePath -> IO (Cradle a)
Expand All @@ -92,8 +88,8 @@ loadImplicitCradle wfile = do
-- Find a cabal file by tracing ancestor directories.
-- Find a sandbox according to a cabal sandbox config
-- in a cabal directory.
loadCradleWithOpts :: (Yaml.FromJSON b) => CradleOpts -> (b -> Cradle a) -> FilePath -> IO (Cradle a)
loadCradleWithOpts _copts buildCustomCradle wfile = do
loadCradleWithOpts :: (Yaml.FromJSON b) => (b -> Cradle a) -> FilePath -> IO (Cradle a)
loadCradleWithOpts buildCustomCradle wfile = do
cradleConfig <- readCradleConfig wfile
return $ getCradle buildCustomCradle (cradleConfig, takeDirectory wfile)

Expand Down
10 changes: 0 additions & 10 deletions src/HIE/Bios/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,10 @@
module HIE.Bios.Types where

import System.Exit
import System.IO
import Control.Exception ( Exception )

data BIOSVerbosity = Silent | Verbose

data CradleOpts = CradleOpts
{ cradleOptsVerbosity :: BIOSVerbosity
, cradleOptsHandle :: Maybe Handle
-- ^ The handle where to send output to, if not set, stderr.
}

defaultCradleOpts :: CradleOpts
defaultCradleOpts = CradleOpts Silent Nothing

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

-- | The environment of a single 'Cradle'.
Expand Down