diff --git a/app/ghcup/GHCup/OptParse/Set.hs b/app/ghcup/GHCup/OptParse/Set.hs index fdc593a..18e8409 100644 --- a/app/ghcup/GHCup/OptParse/Set.hs +++ b/app/ghcup/GHCup/OptParse/Set.hs @@ -259,7 +259,7 @@ set :: forall m env. -> m (VEither eff GHCTargetVersion)) -> (ReaderT LeanAppState m () -> m ()) -> m ExitCode -set setCommand runAppState runLeanAppState runLogger = case setCommand of +set setCommand runAppState _ runLogger = case setCommand of (Right sopts) -> do runLogger (logWarn "This is an old-style command for setting GHC. Use 'ghcup set ghc' instead.") setGHC' sopts @@ -271,10 +271,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of where setGHC' :: SetOptions -> m ExitCode - setGHC' SetOptions{ sToolVer } = - case sToolVer of - (SetGHCVersion v) -> runSetGHC runLeanAppState (liftE $ setGHC v SetGHCOnly Nothing >> pure v) - _ -> runSetGHC runAppState (do + setGHC' SetOptions{ sToolVer } = runSetGHC runAppState (do v <- liftE $ fst <$> fromVersion' sToolVer GHC liftE $ setGHC v SetGHCOnly Nothing ) @@ -291,10 +288,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of setCabal' :: SetOptions -> m ExitCode - setCabal' SetOptions{ sToolVer } = - case sToolVer of - (SetToolVersion v) -> runSetCabal runLeanAppState (liftE $ setCabal v >> pure (mkTVer v)) - _ -> runSetCabal runAppState (do + setCabal' SetOptions{ sToolVer } = runSetCabal runAppState (do v <- liftE $ fst <$> fromVersion' sToolVer Cabal liftE $ setCabal (_tvVersion v) pure v @@ -311,10 +305,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of setHLS' :: SetOptions -> m ExitCode - setHLS' SetOptions{ sToolVer } = - case sToolVer of - (SetToolVersion v) -> runSetHLS runLeanAppState (liftE $ setHLS v SetHLSOnly Nothing >> pure (mkTVer v)) - _ -> runSetHLS runAppState (do + setHLS' SetOptions{ sToolVer } = runSetHLS runAppState (do v <- liftE $ fst <$> fromVersion' sToolVer HLS liftE $ setHLS (_tvVersion v) SetHLSOnly Nothing pure v @@ -332,10 +323,7 @@ set setCommand runAppState runLeanAppState runLogger = case setCommand of setStack' :: SetOptions -> m ExitCode - setStack' SetOptions{ sToolVer } = - case sToolVer of - (SetToolVersion v) -> runSetStack runLeanAppState (liftE $ setStack v >> pure (mkTVer v)) - _ -> runSetStack runAppState (do + setStack' SetOptions{ sToolVer } = runSetStack runAppState (do v <- liftE $ fst <$> fromVersion' sToolVer Stack liftE $ setStack (_tvVersion v) pure v