adjust other libs

lib/dbvar/src/Database/Persist/Delta.hs

@@ -18,7 +18,7 @@ import Prelude hiding
     ( all )
 
 import Control.Monad
-    ( forM_, void )
+    ( forM_, void, when )
 import Control.Monad.IO.Class
     ( MonadIO, liftIO )
 import Data.Bifunctor
@@ -160,7 +160,7 @@ newDatabaseStore db = do
             rememberSupply (apply ds table) -- need to use updated supply
         }
   where
-    debug m = if False then m else pure ()
+    debug m = when False m
 
     update1 _ (InsertManyDB zs) = void $ repsertMany db zs
     update1 _ (DeleteManyDB ks) = forM_ ks $ deleteOne db

lib/dbvar/src/Demo/Database.hs

@@ -161,8 +161,8 @@ instance MonadSTM (NoLoggingT (ResourceT IO)) where
     atomically = liftIO . STM.atomically . unWrapSTM
     newTVar = WrapSTM . STM.newTVar
     readTVar = WrapSTM . STM.readTVar
-    writeTVar = \v -> WrapSTM . STM.writeTVar v
-    modifyTVar'    = \v -> WrapSTM . STM.modifyTVar' v
+    writeTVar v = WrapSTM . STM.writeTVar v
+    modifyTVar' v = WrapSTM . STM.modifyTVar' v
 
 -- | Helper type for the above instance.
 newtype WrapSTM a = WrapSTM { unWrapSTM :: STM.STM a }
@@ -180,8 +180,8 @@ instance MonadThrow (NoLoggingT (ResourceT IO)) where
 
 instance MonadCatch (NoLoggingT (ResourceT IO)) where
     catch = ResourceT.catch
-    generalBracket before after action =
-        ResourceT.generalBracket before (\a -> after a . contra) action
+    generalBracket before after =
+        ResourceT.generalBracket before (\a -> after a . contra)
       where
         contra (ResourceT.ExitCaseSuccess a) = ExitCaseSuccess a
         contra (ResourceT.ExitCaseException e) = ExitCaseException e

lib/numeric/test/unit/Cardano/Numeric/UtilSpec.hs

@@ -12,7 +12,7 @@ import Cardano.Numeric.Util
 import Data.List.NonEmpty
     ( NonEmpty (..) )
 import Data.Maybe
-    ( catMaybes )
+    ( mapMaybe )
 import Data.Monoid
     ( Sum (..) )
 import Data.Ratio
@@ -190,7 +190,7 @@ prop_partitionNatural_fair target weights =
 
 instance Arbitrary a => Arbitrary (NE.NonEmpty a) where
     arbitrary = (:|) <$> arbitrary <*> arbitrary
-    shrink xs = catMaybes $ NE.nonEmpty <$> shrink (NE.toList xs)
+    shrink xs = mapMaybe NE.nonEmpty (shrink (NE.toList xs))
 
 instance Arbitrary Natural where
     arbitrary = arbitrarySizedNatural

lib/primitive/lib/Cardano/Wallet/Primitive/Types/UTxOIndex/Internal.hs

@@ -770,7 +770,7 @@ indexIsConsistent i = F.and
         => Map a (NonEmptySet u)
         -> Map a (NonEmptySet u)
         -> Bool
-    isSubmapOf m1 m2 = Map.isSubmapOfBy isNonEmptySubsetOf m1 m2
+    isSubmapOf = Map.isSubmapOfBy isNonEmptySubsetOf
       where
         isNonEmptySubsetOf s1 s2 =
             NonEmptySet.toSet s1 `Set.isSubsetOf` NonEmptySet.toSet s2

lib/primitive/lib/Cardano/Wallet/Primitive/Types/UTxOSelection.hs

@@ -162,11 +162,11 @@ newtype UTxOSelectionNonEmpty u = UTxOSelectionNonEmpty (State u)
 
 instance HasUTxOSelectionState UTxOSelection u where
     state (UTxOSelection s) = s
-    fromState s = UTxOSelection s
+    fromState = UTxOSelection
 
 instance HasUTxOSelectionState UTxOSelectionNonEmpty u where
     state (UTxOSelectionNonEmpty s) = s
-    fromState s = UTxOSelectionNonEmpty s
+    fromState = UTxOSelectionNonEmpty
 
 instance IsUTxOSelection UTxOSelection u where
     type SelectedList UTxOSelection u = [(u, TokenBundle)]

lib/primitive/test/spec/Cardano/Wallet/Primitive/Types/UTxOIndexSpec.hs

@@ -36,6 +36,8 @@ import Cardano.Wallet.Primitive.Types.UTxOIndex.Internal
     , categorizeTokenBundle
     , checkInvariant
     )
+import Control.Monad
+    ( void )
 import Control.Monad.Random.Class
     ( MonadRandom (..) )
 import Data.Function
@@ -408,7 +410,7 @@ prop_SelectionFilter_coverage selectionFilter = checkCoverage $ property
         "SelectAny"
     True
   where
-    category = () <$ selectionFilter
+    category = void selectionFilter
 
 -- | Attempt to select a random entry from an empty index.
 --
@@ -459,7 +461,7 @@ prop_selectRandom index selectionFilter = monadicIO $
             "matchNegative && category == SelectAny"
         $ maybe prop_inner_Nothing prop_inner_Just maybeSelected
       where
-        category = () <$ selectionFilter
+        category = void selectionFilter
         matchPositive = maybeSelected & isJust
         matchNegative = maybeSelected & isNothing
 

lib/strict-non-empty-containers/test/unit/Data/Map/Strict/NonEmptyMapSpec.hs

@@ -37,8 +37,7 @@ import Test.QuickCheck.Classes
 import Test.Utils.Laws
     ( testLawsMany )
 
-{- HLINT ignore "Avoid restricted qualification" -}
-import qualified Data.List.NonEmpty as NonEmptyList
+import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as Map
 import qualified Data.Map.Strict.NonEmptyMap.Internal as NonEmptyMap
 
@@ -108,8 +107,8 @@ prop_fromList_toList :: NonEmpty (Int, Int) -> Property
 prop_fromList_toList xs =
     expected === actual
   where
-    expected = Map.toList $ Map.fromList $ NonEmptyList.toList xs
-    actual = NonEmptyList.toList $ NonEmptyMap.toList $ NonEmptyMap.fromList xs
+    expected = Map.toList $ Map.fromList $ NE.toList xs
+    actual = NE.toList $ NonEmptyMap.toList $ NonEmptyMap.fromList xs
 
 prop_fromMap_invariant :: [(Int, Int)] -> Property
 prop_fromMap_invariant xs = property $
@@ -121,7 +120,7 @@ prop_fromMap_toMap :: NonEmpty (Int, Int) -> Property
 prop_fromMap_toMap xs =
     expected === actual
   where
-    expected = Map.fromList $ NonEmptyList.toList xs
+    expected = Map.fromList $ NE.toList xs
     actual = NonEmptyMap.toMap $ NonEmptyMap.fromList xs
 
 prop_singleton_invariant :: (Int, Int) -> Property
@@ -155,7 +154,7 @@ prop_delete :: NonEmpty (Int, Int) -> Int -> Property
 prop_delete kvs k =
     expected === actual
   where
-    expected = Map.delete k $ Map.fromList $ NonEmptyList.toList kvs
+    expected = Map.delete k $ Map.fromList $ NE.toList kvs
     actual
         = maybe mempty NonEmptyMap.toMap
         $ NonEmptyMap.delete k
@@ -169,7 +168,7 @@ prop_lookup :: NonEmpty (Int, Int) -> Int -> Property
 prop_lookup kvs k =
     expected === actual
   where
-    expected = Map.lookup k $ Map.fromList $ NonEmptyList.toList kvs
+    expected = Map.lookup k $ Map.fromList $ NE.toList kvs
     actual = NonEmptyMap.lookup k $ NonEmptyMap.fromList kvs
 
 --------------------------------------------------------------------------------
@@ -187,8 +186,8 @@ prop_unionWith kvs1 kvs2 =
     expected === actual
   where
     expected = Map.unionWith (+)
-        (Map.fromList $ NonEmptyList.toList kvs1)
-        (Map.fromList $ NonEmptyList.toList kvs2)
+        (Map.fromList $ NE.toList kvs1)
+        (Map.fromList $ NE.toList kvs2)
     actual = NonEmptyMap.toMap $ NonEmptyMap.unionWith (+)
         (NonEmptyMap.fromList kvs1)
         (NonEmptyMap.fromList kvs2)

lib/test-utils/src/Test/Utils/Env.hs

@@ -48,7 +48,7 @@ withEnv' prepare env = bracket getEnvironment resetEnvironment . run
   where
     resetEnvironment pre = clearEnv >> setEnvs pre
     setEnvs = mapM_ (uncurry setEnv)
-    run action = \pre -> prepare pre >> setEnvs env >> action
+    run action pre = prepare pre >> setEnvs env >> action
 
 -- | Unsets all environment variables for this process.
 clearEnv :: MonadIO m => m ()

lib/test-utils/test/Test/QuickCheck/ExtraSpec.hs

@@ -796,27 +796,27 @@ unit_shrinkWhileSteps_Int = unitTests
     tests :: [UnitTestData (Int, (Int -> Bool)) [Int]]
     tests =
         [ UnitTestData
-            { params = (1024, (>= 0))
+            { params = (1_024, (>= 0))
             , result = [0]
             }
         , UnitTestData
-            { params = (1024, (>= 1))
+            { params = (1_024, (>= 1))
             , result = [512, 256, 128, 64, 32, 16, 8, 4, 2, 1]
             }
         , UnitTestData
-            { params = (1024, (>= 10))
+            { params = (1_024, (>= 10))
             , result = [512, 256, 128, 64, 32, 16, 12, 11, 10]
             }
         , UnitTestData
-            { params = (1024, (>= 100))
+            { params = (1_024, (>= 100))
             , result = [512, 256, 128, 112, 105, 102, 101, 100]
             }
         , UnitTestData
-            { params = (1024, (>= 1000))
-            , result = [1008, 1001, 1000]
+            { params = (1_024, (>= 1_000))
+            , result = [1_008, 1_001, 1_000]
             }
         , UnitTestData
-            { params = (1024, (>= 10000))
+            { params = (1_024, (>= 10_000))
             , result = []
             }
         ]

lib/wai-middleware-logging/test/Network/Wai/Middleware/LoggingSpec.hs

@@ -330,7 +330,7 @@ logMessage (ApiLog _ theMsg) = case theMsg of
 
 -- | Number of microsecond in one millisecond
 ms :: Int
-ms = 1000
+ms = 1_000
 
 {-------------------------------------------------------------------------------
                             Arbitrary instances