From 13e01ab4535ffef73122ccc03dd7fcf21a669690 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 7 Jul 2022 14:24:48 +0200 Subject: [PATCH] Fix hlint warnings --- lib/GHCup/GHC.hs | 4 ++-- lib/GHCup/HLS.hs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/GHCup/GHC.hs b/lib/GHCup/GHC.hs index 4fb1408..1bfe494 100644 --- a/lib/GHCup/GHC.hs +++ b/lib/GHCup/GHC.hs @@ -726,8 +726,8 @@ compileGHC targetGhc ov bstrap jobs mbuildConfig patches aargs buildFlavour hadr liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform (fromGHCupPath tmpUnpack) lift $ logInfo $ "Examining git ref " <> T.pack ref <> "\n " <> "GHC version (from Makefile): " <> prettyVer tver <> - (if not shallow_clone then ("\n " <> "'git describe' output: " <> fromJust git_describe) else mempty) <> - (if isCommitHash ref then mempty else ("\n " <> "commit hash: " <> chash)) + (if not shallow_clone then "\n " <> "'git describe' output: " <> fromJust git_describe else mempty) <> + (if isCommitHash ref then mempty else "\n " <> "commit hash: " <> chash) liftIO $ threadDelay 5000000 -- give the user a sec to intervene pure tver diff --git a/lib/GHCup/HLS.hs b/lib/GHCup/HLS.hs index 063474f..9b99069 100644 --- a/lib/GHCup/HLS.hs +++ b/lib/GHCup/HLS.hs @@ -422,8 +422,8 @@ compileHLS targetHLS ghcs jobs ov installDir cabalProject cabalProjectLocal patc liftE $ catchWarn $ lEM @_ @'[ProcessError] $ darwinNotarization _rPlatform (fromGHCupPath tmpUnpack) lift $ logInfo $ "Examining git ref " <> T.pack ref <> "\n " <> "HLS version (from cabal file): " <> prettyVer tver <> - (if not shallow_clone then ("\n " <> "'git describe' output: " <> fromJust git_describe) else mempty) <> - (if isCommitHash ref then mempty else ("\n " <> "commit hash: " <> chash)) + (if not shallow_clone then "\n " <> "'git describe' output: " <> fromJust git_describe else mempty) <> + (if isCommitHash ref then mempty else "\n " <> "commit hash: " <> chash) pure (tmpUnpack, tver, git_describe)