Use shorter cross-compiler friendly HLint annotations

cardano-foundation · Oct 16, 2020 · 23e9257 · 23e9257
1 parent 95c37bc
commit 23e9257
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 22 deletions.
diff --git a/lib/core/src/Cardano/Byron/Codec/Cbor.hs b/lib/core/src/Cardano/Byron/Codec/Cbor.hs
@@ -1,6 +1,3 @@
--- need this for {-# HLINT ... #-}; see https://github.com/ndmitchell/hlint#ignoring-hints
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
-
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
@@ -281,7 +278,7 @@ decodeTx = do
     _ <- decodeEmptyAttributes
     return (ins, outs)
 
-{-# HLINT ignore decodeTxIn "Use <$>" #-}
+{- HLINT ignore decodeTxIn "Use <$>" -}
 decodeTxIn :: CBOR.Decoder s TxIn
 decodeTxIn = do
     _ <- CBOR.decodeListLenCanonicalOf 2
@@ -301,7 +298,7 @@ decodeTxIn = do
         tx <- Hash <$> CBOR.decodeBytes
         TxIn tx <$> CBOR.decodeWord32
 
-{-# HLINT ignore decodeTxOut "Use <$>" #-}
+{- HLINT ignore decodeTxOut "Use <$>" -}
 decodeTxOut :: CBOR.Decoder s TxOut
 decodeTxOut = do
     _ <- CBOR.decodeListLenCanonicalOf 2

diff --git a/lib/core/src/Cardano/DB/Sqlite.hs b/lib/core/src/Cardano/DB/Sqlite.hs
@@ -13,8 +13,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
-{-# HLINT ignore "Redundant flip" #-}
+{- HLINT ignore "Redundant flip" -}
 
 -- |
 -- Copyright: © 2018-2020 IOHK

diff --git a/lib/core/src/Cardano/Pool/DB/Model.hs b/lib/core/src/Cardano/Pool/DB/Model.hs
@@ -451,7 +451,7 @@ mReadSettings = get #settings
 -- `const` isn't more readable than lambdas. Our language is based on
 -- lambda calculus and we shouldn't feel ashamed to use them. They also
 -- have different strictness properties.
-{-# HLINT ignore mPutSettings "Use const" #-}
+{- HLINT ignore mPutSettings "Use const" -}
 mPutSettings
     :: Settings
     -> ModelOp ()

diff --git a/lib/core/src/Cardano/Pool/DB/Sqlite.hs b/lib/core/src/Cardano/Pool/DB/Sqlite.hs
@@ -14,8 +14,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
-{-# HLINT ignore "Redundant flip" #-}
+{- HLINT ignore "Redundant flip" -}
 
 -- |
 -- Copyright: © 2018-2020 IOHK

diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite.hs
@@ -12,8 +12,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
-{-# HLINT ignore "Redundant flip" #-}
+{- HLINT ignore "Redundant flip" -}
 
 -- |
 -- Copyright: © 2018-2020 IOHK

diff --git a/lib/core/test/unit/Cardano/Byron/Codec/CborSpec.hs b/lib/core/test/unit/Cardano/Byron/Codec/CborSpec.hs
@@ -58,7 +58,7 @@ import qualified Data.ByteArray as BA
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BL
 
-{-# ANN spec ("HLint: ignore Use head" :: String) #-}
+{- HLINT ignore spec "Use head" -}
 
 spec :: Spec
 spec = do

diff --git a/lib/core/test/unit/Cardano/Wallet/DB/StateMachine.hs b/lib/core/test/unit/Cardano/Wallet/DB/StateMachine.hs
@@ -229,7 +229,7 @@ import qualified Test.QuickCheck as QC
 import qualified Test.StateMachine.Types as QSM
 import qualified Test.StateMachine.Types.Rank2 as Rank2
 
-{-# ANN module ("HLint: ignore Unused LANGUAGE pragma" :: String) #-}
+{- HLINT ignore "Unused LANGUAGE pragma" -}
 
 {-------------------------------------------------------------------------------
   Mock implementation
@@ -569,7 +569,7 @@ lockstep m@(Model _ ws) c (At resp) = Event
   Generator
 -------------------------------------------------------------------------------}
 
-{-# ANN generator ("HLint: ignore Use ++" :: String) #-}
+{- HLINT ignore generator "Use ++" -}
 generator
     :: forall s. (Arbitrary (Wallet s), GenState s)
     => Model s Symbolic

diff --git a/lib/core/test/unit/Cardano/Wallet/Primitive/CoinSelectionSpec.hs b/lib/core/test/unit/Cardano/Wallet/Primitive/CoinSelectionSpec.hs
@@ -84,7 +84,7 @@ import qualified Data.Map.Strict as Map
 import qualified Data.Set as Set
 import qualified Test.QuickCheck.Monadic as QC
 
-{-# ANN module ("HLint: ignore Use <$>" :: String) #-}
+{- HLINT ignore "Use <$>" -}
 
 spec :: Spec
 spec = do

diff --git a/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Binary.hs b/lib/jormungandr/src/Cardano/Wallet/Jormungandr/Binary.hs
@@ -197,7 +197,7 @@ maxNumberOfOutputs = 254
 -------------------------------------------------------------------------------}
 
 -- Do-notation is favoured over applicative syntax for readability:
-{-# ANN module ("HLint: ignore Use <$>" :: String) #-}
+{- HLINT ignore "Use <$>" -}
 
 data BlockHeader = BlockHeader
     { version :: Word16

diff --git a/lib/jormungandr/test/integration/Cardano/Wallet/Jormungandr/NetworkSpec.hs b/lib/jormungandr/test/integration/Cardano/Wallet/Jormungandr/NetworkSpec.hs
@@ -129,7 +129,7 @@ import qualified Cardano.Wallet.Jormungandr.Api.Client as Jormungandr
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Char8 as B8
 
-{-# ANN spec ("HLint: ignore Use head" :: String) #-}
+{- HLINT ignore spec "Use head" -}
 
 spec :: Spec
 spec = do

diff --git a/lib/jormungandr/test/unit/Cardano/Pool/Jormungandr/MetricsSpec.hs b/lib/jormungandr/test/unit/Cardano/Pool/Jormungandr/MetricsSpec.hs
@@ -8,7 +8,6 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
 
 module Cardano.Pool.Jormungandr.MetricsSpec
     ( spec
@@ -177,7 +176,7 @@ prop_combineIsLeftBiased mStake_ mProd_ mPerf_ =
     mStake = Map.mapKeys getLowEntropy mStake_
     mProd  = Map.mapKeys getLowEntropy mProd_
     mPerf  = Map.mapKeys getLowEntropy mPerf_
-{-# HLINT ignore prop_combineIsLeftBiased "Use ||" #-}
+{- HLINT ignore prop_combineIsLeftBiased "Use ||" -}
 
 -- | A list of chunks of blocks to be served up by the mock network layer.
 newtype RegistrationsTest = RegistrationsTest

diff --git a/lib/launcher/test/unit/Cardano/LauncherSpec.hs b/lib/launcher/test/unit/Cardano/LauncherSpec.hs
@@ -81,7 +81,8 @@ import Test.Hspec
 import Test.Utils.Windows
     ( isWindows, pendingOnWine )
 
-{-# ANN spec ("HLint: ignore Use head" :: String) #-}
+{- HLINT ignore spec "Use head" -}
+
 spec :: Spec
 spec = beforeAll setupMockCommands $ do
     it "Buildable Command" $ \MockCommands{..} -> do

diff --git a/lib/shelley/bench/Restore.hs b/lib/shelley/bench/Restore.hs
@@ -528,7 +528,7 @@ benchmarksSeq _ w wid wname restoreTime = do
         , walletOverview
         }
 
-{-# ANN bench_restoration ("HLint: ignore Use camelCase" :: String) #-}
+{- HLINT ignore bench_restoration "Use camelCase" -}
 bench_restoration
     :: forall (n :: NetworkDiscriminant) (k :: Depth -> * -> *) s t results.
         ( IsOurs s Address