Skip to content

Commit 7b1f591

Browse files
hsyl20hasufell
authored andcommitted
Fix Lint issues
1 parent 0ecd244 commit 7b1f591

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

lib/GHCup/Cabal.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import Control.Monad.Trans.Resource
3838
hiding ( throwM )
3939
import Data.Either
4040
import Data.List
41+
import Data.Ord
4142
import Data.Maybe
4243
import Data.Versions hiding ( patch )
4344
import Haskus.Utils.Variant.Excepts
@@ -280,6 +281,6 @@ rmCabalVer ver = do
280281

281282
when (Just ver == cSet) $ do
282283
cVers <- lift $ fmap rights getInstalledCabals
283-
case headMay . reverse . sort $ cVers of
284+
case headMay . sortBy (comparing Down) $ cVers of
284285
Just latestver -> setCabal latestver
285286
Nothing -> lift $ rmLink (binDir </> "cabal" <> exeExt)

lib/GHCup/HLS.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import Control.Monad.Trans.Resource
4343
import Data.ByteString ( ByteString )
4444
import Data.Either
4545
import Data.List
46+
import Data.Ord
4647
import Data.Maybe
4748
import Data.String ( fromString )
4849
import Data.Text ( Text )
@@ -704,7 +705,7 @@ rmHLSVer ver = do
704705
when (Just ver == isHlsSet) $ do
705706
-- set latest hls
706707
hlsVers <- lift $ fmap rights getInstalledHLSs
707-
case headMay . reverse . sort $ hlsVers of
708+
case headMay . sortBy (comparing Down) $ hlsVers of
708709
Just latestver -> liftE $ setHLS latestver SetHLSOnly Nothing
709710
Nothing -> pure ()
710711

lib/GHCup/Stack.hs

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import Control.Monad.Trans.Resource
3838
hiding ( throwM )
3939
import Data.Either
4040
import Data.List
41+
import Data.Ord
4142
import Data.Maybe
4243
import Data.Versions hiding ( patch )
4344
import Haskus.Utils.Variant.Excepts
@@ -279,6 +280,6 @@ rmStackVer ver = do
279280

280281
when (Just ver == sSet) $ do
281282
sVers <- lift $ fmap rights getInstalledStacks
282-
case headMay . reverse . sort $ sVers of
283+
case headMay . sortBy (comparing Down) $ sVers of
283284
Just latestver -> setStack latestver
284285
Nothing -> lift $ rmLink (binDir </> "stack" <> exeExt)

lib/GHCup/Version.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ versionCmp ver1 (VR_lteq ver2) = ver1 <= ver2
5252
versionCmp ver1 (VR_eq ver2) = ver1 == ver2
5353

5454
versionRange :: V.Versioning -> VersionRange -> Bool
55-
versionRange ver' (SimpleRange cmps) = and $ fmap (versionCmp ver') cmps
55+
versionRange ver' (SimpleRange cmps) = all (versionCmp ver') cmps
5656
versionRange ver' (OrRange cmps range) =
5757
versionRange ver' (SimpleRange cmps) || versionRange ver' range
5858

0 commit comments

Comments
 (0)