Fix new HLint hints

Author: phadej

src/HaskellCI/Auxiliary.hs

@@ -88,9 +88,9 @@ auxiliary Config {..} prj JobVersions {..} = Auxiliary {..}
     extraCabalProjectFields rootdir = buildList $ do
         -- generate package fields for URI packages.
         for_ uris $ \uri ->
-            item $ C.PrettyField () "packages" $ PP.text $ if
-                | URI.uriScheme uri == "file:" -> rootdir ++ URI.uriPath uri
-                | otherwise                    -> uriToString id uri ""
+            item $ C.PrettyField () "packages" $ PP.text $ case URI.uriScheme uri of
+                "file:" -> rootdir ++ URI.uriPath uri
+                _       -> uriToString id uri ""
 
         -- copy fields from original cabal.project
         case cfgCopyFields of

src/HaskellCI/Bash.hs

@@ -198,7 +198,7 @@ makeBash _argv config@Config {..} prj jobs@JobVersions {..} = do
             change_dir "$BUILDDIR"
 
         -- haddock
-        when (not (equivVersionRanges C.noVersion cfgHaddock)) $ step "haddock" $ do
+        unless (equivVersionRanges C.noVersion cfgHaddock) $ step "haddock" $ do
             let range = RangeGHC /\ Range cfgHaddock
             run_cmd_if range "$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all"
 

src/HaskellCI/Compiler.hs

@@ -190,7 +190,7 @@ previewGHC
     -> CompilerVersion
     -> Bool
 previewGHC _vr GHCHead   = True
-previewGHC  vr (GHC v)   = withinRange v vr || odd (snd (ghcMajVer v)) || maybe False (v >=) (fmap fst ghcAlpha)
+previewGHC  vr (GHC v)   = withinRange v vr || odd (snd (ghcMajVer v)) || maybe False (\(v', _) -> v >= v') ghcAlpha
 previewGHC _vr (GHCJS _) = False
 
 ghcMajVer :: Version -> (Int,Int)

src/HaskellCI/Travis.hs

@@ -375,7 +375,7 @@ makeTravis argv config@Config {..} prj jobs@JobVersions {..} = do
                 "(cd " ++ pkgNameDirVariable pkgName ++ " && ${CABAL} -vnormal check)"
 
         -- haddock
-        when (not (equivVersionRanges C.noVersion cfgHaddock)) $
+        unless (equivVersionRanges C.noVersion cfgHaddock) $
             foldedSh FoldHaddock "haddock..." cfgFolds $
                 shForJob (RangeGHC /\ Range cfgHaddock) $ cabal $ "v2-haddock --haddock-all $WITHCOMPILER " ++ withHaddock ++ " ${TEST} ${BENCH} all"