chore: remove warnings from hsec-tools

Author: blackheaven

code/hsec-tools/src/Security/Advisories/Filesystem.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 {-|
 
 Helpers for the /security-advisories/ file system.
@@ -24,7 +26,10 @@ module Security.Advisories.Filesystem
   , parseComponentIdentifier
   ) where
 
+#if MIN_VERSION_base(4,18,0)
+#else
 import Control.Applicative (liftA2)
+#endif
 import Data.Bifunctor (bimap)
 import Data.Foldable (fold)
 import Data.Semigroup (Max(Max, getMax))

code/hsec-tools/src/Security/Advisories/Git.hs

@@ -19,6 +19,7 @@ module Security.Advisories.Git
 
 import Data.Char (isSpace)
 import Data.List (dropWhileEnd)
+import qualified Data.List.NonEmpty as NE
 import Data.Time (UTCTime, zonedTimeToUTC)
 import Data.Time.Format.ISO8601 (iso8601ParseM)
 import System.Exit (ExitCode(ExitSuccess))
@@ -110,10 +111,10 @@ getAdvisoryGitInfo path = do
     "" -- standard input
   let timestamps = filter (not . null) $ lines stdout
   case status of
-    ExitSuccess | not (null timestamps) ->
+    ExitSuccess | Just timestamps' <- NE.nonEmpty timestamps ->
       pure $ AdvisoryGitInfo
-        <$> parseTime (last timestamps)  -- first commit is last line
-        <*> parseTime (head timestamps)  -- most recent commit is first line
+        <$> parseTime (NE.last timestamps')  -- first commit is last line
+        <*> parseTime (NE.head timestamps')  -- most recent commit is first line
     _ ->
       -- `null lines` should not happen, but if it does we treat it
       -- the same as `ExitFailure`

code/hsec-tools/src/Security/Advisories/Parse.hs

@@ -26,9 +26,6 @@ import Data.Foldable (toList)
 import Data.Maybe (fromMaybe)
 import Data.Monoid (First(..))
 
-import Data.Tuple (swap)
-import Control.Applicative ((<|>))
-
 import GHC.Generics (Generic)
 
 import Data.Sequence (Seq((:<|)))

code/hsec-tools/test/Spec/FormatSpec.hs

@@ -4,7 +4,6 @@
 
 module Spec.FormatSpec (spec) where
 
-import Data.Fixed (Fixed (MkFixed))
 import Data.Function (on)
 import qualified Data.Map.Strict as Map
 import Data.Text (Text)