change type of rmGhcup fn from "Excepts '[NotInstalled] m ()" to m ()
This commit is contained in:
parent
bb7229d224
commit
d166cc84a1
10
lib/GHCup.hs
10
lib/GHCup.hs
@ -1284,13 +1284,13 @@ rmStackVer ver = do
|
|||||||
|
|
||||||
-- assuming the current scheme of having just 1 ghcup bin, no version info is required.
|
-- assuming the current scheme of having just 1 ghcup bin, no version info is required.
|
||||||
rmGhcup :: ( MonadReader AppState m
|
rmGhcup :: ( MonadReader AppState m
|
||||||
, MonadIO m,
|
, MonadIO m
|
||||||
MonadCatch m
|
, MonadCatch m
|
||||||
)
|
)
|
||||||
=> Excepts '[NotInstalled] m ()
|
=> m ()
|
||||||
|
|
||||||
rmGhcup = do
|
rmGhcup = do
|
||||||
AppState {dirs = Dirs {binDir}} <- lift ask
|
AppState {dirs = Dirs {binDir}} <- ask
|
||||||
let ghcupFilename = "ghcup" <> exeExt
|
let ghcupFilename = "ghcup" <> exeExt
|
||||||
let ghcupFilepath = binDir </> ghcupFilename
|
let ghcupFilepath = binDir </> ghcupFilename
|
||||||
#if defined(IS_WINDOWS)
|
#if defined(IS_WINDOWS)
|
||||||
@ -1332,7 +1332,7 @@ rmTool ListResult {lVer, lTool, lCross} = do
|
|||||||
rmStackVer lVer
|
rmStackVer lVer
|
||||||
|
|
||||||
GHCup -> do
|
GHCup -> do
|
||||||
rmGhcup
|
lift rmGhcup
|
||||||
|
|
||||||
rmGhcupDirs :: ( MonadReader AppState m
|
rmGhcupDirs :: ( MonadReader AppState m
|
||||||
, MonadIO m
|
, MonadIO m
|
||||||
|
Loading…
Reference in New Issue
Block a user