Remove all usage of Data.Map

IntersectMBO · Nov 28, 2022 · d6e134f · d6e134f
1 parent 4198592
commit d6e134f
Show file tree

Hide file tree

Showing 20 changed files with 45 additions and 45 deletions.
diff --git a/STYLE.md b/STYLE.md
@@ -266,8 +266,8 @@ Unqualified types (i.e. `Map` vs. `M.Map`) look pretty good and not so ugly.
 Prefer two-line imports for such standard containers.
 
 ```haskell
-import           Data.Map (Map)
-import qualified Data.Map as Map
+import           Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 ```
 
 ### Data Declarations

diff --git a/cardano-api/src/Cardano/Api/Fees.hs b/cardano-api/src/Cardano/Api/Fees.hs
@@ -48,8 +48,8 @@ import qualified Data.Array as Array
 import           Data.Bifunctor (bimap, first)
 import qualified Data.ByteString as BS
 import           Data.ByteString.Short (ShortByteString)
-import           Data.Map (Map)
-import qualified Data.Map as Map
+import           Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import           Data.Maybe (catMaybes, fromMaybe, maybeToList)
 import           Data.Ratio
 import           Data.Sequence.Strict (StrictSeq (..))

diff --git a/cardano-api/src/Cardano/Api/Query.hs b/cardano-api/src/Cardano/Api/Query.hs
@@ -73,8 +73,8 @@ import           Data.Aeson.Types (Parser)
 import           Data.Bifunctor (bimap, first)
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.HashMap.Strict as HMS
-import           Data.Map (Map)
-import qualified Data.Map as Map
+import           Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import           Data.Maybe (mapMaybe)
 import           Data.Set (Set)
 import qualified Data.Set as Set

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Validate.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Validate.hs
@@ -40,7 +40,7 @@ import           Cardano.Api
 import           Cardano.Api.Shelley
 
 import           Data.Bifunctor (first)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Maybe
 import qualified Data.Text as Text
 

diff --git a/cardano-node/src/Cardano/Node/Configuration/Logging.hs b/cardano-node/src/Cardano/Node/Configuration/Logging.hs
@@ -32,7 +32,7 @@ import           Control.Exception.Safe (MonadCatch)
 import           Control.Monad.Trans.Except.Extra (catchIOExceptT)
 import           "contra-tracer" Control.Tracer
 import           Data.List (nub)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Text (pack)
 import           Data.Time.Clock (UTCTime, getCurrentTime)
 import           Data.Version (showVersion)

diff --git a/cardano-node/src/Cardano/Node/Startup.hs b/cardano-node/src/Cardano/Node/Startup.hs
@@ -11,7 +11,7 @@ import qualified Cardano.Api as Api
 import           Prelude
 
 import           Data.Aeson (FromJSON, ToJSON)
-import           Data.Map (Map)
+import           Data.Map.Strict (Map)
 import           Data.Monoid (Last (..), getLast)
 import           Data.Text (Text, pack)
 import           Data.Time.Clock (NominalDiffTime, UTCTime)

diff --git a/cardano-node/src/Cardano/Node/Tracing/API.hs b/cardano-node/src/Cardano/Node/Tracing/API.hs
@@ -12,7 +12,7 @@ import           Prelude
 
 import           "contra-tracer" Control.Tracer (traceWith)
 import           "trace-dispatcher" Control.Tracer (nullTracer)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Maybe (fromMaybe)
 import           Data.Time.Clock (getCurrentTime)
 

diff --git a/cardano-node/src/Cardano/Node/Tracing/DefaultTraceConfig.hs b/cardano-node/src/Cardano/Node/Tracing/DefaultTraceConfig.hs
@@ -2,8 +2,8 @@ module Cardano.Node.Tracing.DefaultTraceConfig
   ( defaultCardanoConfig
   ) where
 
+import qualified Data.Map.Strict as Map
 import           Prelude
-import qualified Data.Map as Map
 
 import           Cardano.Logging
 

diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Startup.hs
@@ -19,7 +19,7 @@ import           Prelude
 
 import           Data.Aeson (ToJSON (..), Value (..), (.=))
 import           Data.List (intercalate)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Text (Text, pack)
 import           Data.Time (getCurrentTime)
 import           Data.Time.Clock.POSIX (POSIXTime, utcTimeToPOSIXSeconds)

diff --git a/cardano-testnet/src/Testnet/Cardano.hs b/cardano-testnet/src/Testnet/Cardano.hs
@@ -17,7 +17,6 @@ module Testnet.Cardano
   , cardanoTestnet
   ) where
 
-import           Prelude
 import           Control.Monad
 import           Control.Monad.IO.Class (liftIO)
 import           Data.Aeson ((.=))
@@ -29,14 +28,15 @@ import           Hedgehog.Extras.Stock.IO.Network.Sprocket (Sprocket (..))
 import           Hedgehog.Extras.Stock.Time (formatIso8601, showUTCTimeSeconds)
 import           Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..))
 import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
+import           Prelude
 import           System.FilePath.Posix ((</>))
 
 import qualified Cardano.Node.Configuration.Topology as NonP2P
 import qualified Cardano.Node.Configuration.TopologyP2P as P2P
 import qualified Data.Aeson as J
 import qualified Data.HashMap.Lazy as HM
 import qualified Data.List as L
-import qualified Data.Map as M
+import qualified Data.Map.Strict as M
 import qualified Data.Time.Clock as DTC
 import qualified Hedgehog.Extras.Stock.Aeson as J
 import qualified Hedgehog.Extras.Stock.IO.Network.Socket as IO
@@ -52,8 +52,8 @@ import qualified System.Info as OS
 import qualified Util.Assert as H
 import qualified Util.Process as H
 import           Util.Process (execCli_)
-import           Util.Runtime as TR (NodeLoggingFormat (..), PaymentKeyPair (..), PoolNode (PoolNode),
-                   PoolNodeKeys (..), TestnetRuntime (..), startNode)
+import           Util.Runtime as TR (NodeLoggingFormat (..), PaymentKeyPair (..),
+                   PoolNode (PoolNode), PoolNodeKeys (..), TestnetRuntime (..), startNode)
 
 import qualified Testnet.Conf as H
 

diff --git a/cardano-testnet/src/Testnet/Shelley.hs b/cardano-testnet/src/Testnet/Shelley.hs
@@ -12,21 +12,21 @@ module Testnet.Shelley
   , hprop_testnet_pause
   ) where
 
-import           Prelude
 import           Control.Monad
-import           Control.Monad.IO.Class (MonadIO(liftIO))
-import           Control.Monad.Trans.Resource (MonadResource(liftResourceT), resourceForkIO)
-import           Data.Aeson (Value, ToJSON(toJSON))
+import           Control.Monad.IO.Class (MonadIO (liftIO))
+import           Control.Monad.Trans.Resource (MonadResource (liftResourceT), resourceForkIO)
+import           Data.Aeson (ToJSON (toJSON), Value)
 import           Data.ByteString.Lazy (ByteString)
 import           Data.Functor
 import           Data.List ((\\))
 import           Data.Maybe
 import           Data.String
 import           Data.Time.Clock (UTCTime)
 import           Hedgehog.Extras.Stock.Aeson (rewriteObject)
-import           Hedgehog.Extras.Stock.IO.Network.Sprocket (Sprocket(..))
-import           Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter(..))
-import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint(..))
+import           Hedgehog.Extras.Stock.IO.Network.Sprocket (Sprocket (..))
+import           Ouroboros.Network.PeerSelection.LedgerPeers (UseLedgerAfter (..))
+import           Ouroboros.Network.PeerSelection.RelayAccessPoint (RelayAccessPoint (..))
+import           Prelude
 import           System.FilePath.Posix ((</>))
 
 import qualified Cardano.Node.Configuration.Topology as NonP2P
@@ -35,7 +35,7 @@ import qualified Control.Concurrent as IO
 import qualified Data.Aeson as J
 import qualified Data.HashMap.Lazy as HM
 import qualified Data.List as L
-import qualified Data.Map as M
+import qualified Data.Map.Strict as M
 import qualified Data.Time.Clock as DTC
 import qualified Hedgehog as H
 import qualified Hedgehog.Extras.Stock.IO.File as IO

diff --git a/cardano-tracer/src/Cardano/Tracer/MetaTrace.hs b/cardano-tracer/src/Cardano/Tracer/MetaTrace.hs
@@ -21,18 +21,18 @@ module Cardano.Tracer.MetaTrace
   ) where
 
 import qualified "trace-dispatcher" Control.Tracer as T
-import Data.Aeson (ToJSON (..), (.=))
-import Data.Aeson qualified as AE
-import Data.Function
-import Data.Map qualified as Map
-import Data.Text (Text)
-import Data.Text qualified as T
-import GHC.Generics
+import           Data.Aeson (ToJSON (..), (.=))
+import qualified Data.Aeson as AE
+import           Data.Function
+import qualified Data.Map.Strict as Map
+import           Data.Text (Text)
+import qualified Data.Text as T
+import           GHC.Generics
 import qualified System.IO as Sys
 
-import Cardano.Logging
+import           Cardano.Logging
 
-import Cardano.Tracer.Configuration
+import           Cardano.Tracer.Configuration
 
 
 ctorTracerTrace :: TracerTrace -> Text

diff --git a/cardano-tracer/test/Cardano/Tracer/Test/ForwardingStressTest/Config.hs b/cardano-tracer/test/Cardano/Tracer/Test/ForwardingStressTest/Config.hs
@@ -7,7 +7,7 @@ module Cardano.Tracer.Test.ForwardingStressTest.Config (
   , config4
   ) where
 
-import           Data.Map (fromList)
+import           Data.Map.Strict (fromList)
 import           Test.QuickCheck
 
 import           Cardano.Logging

diff --git a/cardano-tracer/test/Cardano/Tracer/Test/ForwardingStressTest/Script.hs b/cardano-tracer/test/Cardano/Tracer/Test/ForwardingStressTest/Script.hs
@@ -18,7 +18,7 @@ import           Control.Monad (when)
 import           Data.Functor.Identity
 import           Data.IORef
 import           Data.List (sort)
-import           Data.Map (fromList)
+import           Data.Map.Strict (fromList)
 import           Data.Maybe
 import           System.FilePath.Glob
 

diff --git a/trace-dispatcher/examples/Examples/Configuration.hs b/trace-dispatcher/examples/Examples/Configuration.hs
@@ -8,7 +8,7 @@ module Examples.Configuration (
 import           Control.Monad.IO.Class
 import qualified Data.Aeson as AE
 import qualified Data.Aeson.KeyMap as KeyMap
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Text (Text)
 
 import           Cardano.Logging

diff --git a/trace-dispatcher/src/Cardano/Logging/Configuration.hs b/trace-dispatcher/src/Cardano/Logging/Configuration.hs
@@ -23,7 +23,7 @@ import           Control.Monad.IO.Unlift (MonadUnliftIO)
 import qualified Control.Tracer as T
 import           Data.IORef (IORef, newIORef, readIORef, writeIORef)
 import           Data.List (maximumBy, nub)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Maybe (fromMaybe, mapMaybe)
 import           Data.Text (Text, intercalate, unpack)
 

diff --git a/trace-dispatcher/src/Cardano/Logging/ConfigurationParser.hs b/trace-dispatcher/src/Cardano/Logging/ConfigurationParser.hs
@@ -19,8 +19,8 @@ import           Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8 as BS
 import           Data.Functor
 import           Data.List (foldl')
+import qualified Data.Map.Strict as Map
 import           Data.Maybe (fromMaybe, isJust)
-import qualified Data.Map as Map
 import           Data.Text (Text, split)
 import           Data.Yaml
 import           GHC.Generics

diff --git a/trace-dispatcher/src/Cardano/Logging/DocuGenerator.hs b/trace-dispatcher/src/Cardano/Logging/DocuGenerator.hs
@@ -21,7 +21,7 @@ import           Control.Monad.IO.Class (MonadIO, liftIO)
 import qualified Control.Tracer as T
 import           Data.IORef (modifyIORef, newIORef, readIORef)
 import           Data.List (groupBy, intersperse, nub, sortBy)
-import qualified Data.Map as Map
+import qualified Data.Map.Strict as Map
 import           Data.Text (Text, pack, toLower)
 import qualified Data.Text as T
 import           Data.Text.Internal.Builder (toLazyText)
@@ -326,7 +326,7 @@ documentMarkdown (Documented documented) tracers = do
 
     documentMetrics :: [LogDoc] -> [([Text], DocuResult)]
     documentMetrics logDocs =
-      let nameCommentNamespaceList = 
+      let nameCommentNamespaceList =
             concatMap (\ld -> zip (Map.toList (ldMetricsDoc ld)) (repeat (ldNamespace ld))) logDocs
           sortedNameCommentNamespaceList =
             sortBy (\a b -> compare ((fst . fst) a) ((fst . fst) b)) nameCommentNamespaceList
@@ -336,7 +336,7 @@ documentMarkdown (Documented documented) tracers = do
 
     documentMetrics' :: [((Text, Text), [Namespace])] -> ([Text], DocuResult)
     documentMetrics' ncns@(((name, comment), _) : _tail) =
-      ([name], DocuMetric 
+      ([name], DocuMetric
               $ mconcat $ intersperse(fromText "\n\n")
                     [ metricToBuilder (name,comment)
                     , namespacesMetricsBuilder (nub (concatMap snd ncns))
@@ -415,7 +415,7 @@ documentMarkdown (Documented documented) tracers = do
                  l))
 
     -- metricsBuilder :: (Text, Text) -> [(Text, Builder)]
-    -- metricsBuilder (name, t) = (name, metricFormatToText t) 
+    -- metricsBuilder (name, t) = (name, metricFormatToText t)
 
     metricToBuilder :: (Text, Text) -> Builder
     metricToBuilder (name, text) =

diff --git a/trace-dispatcher/src/Cardano/Logging/Types.hs b/trace-dispatcher/src/Cardano/Logging/Types.hs
@@ -52,8 +52,8 @@ import qualified Data.Aeson as AE
 import qualified Data.Aeson.Text as AE
 import qualified Data.HashMap.Strict as HM
 import           Data.IORef
-import           Data.Map (Map)
-import qualified Data.Map as Map
+import           Data.Map.Strict (Map)
+import qualified Data.Map.Strict as Map
 import qualified Data.Map.Strict as SMap
 
 import           Data.Text (Text, pack, unpack)

diff --git a/trace-dispatcher/test/Cardano/Logging/Test/Config.hs b/trace-dispatcher/test/Cardano/Logging/Test/Config.hs
@@ -7,7 +7,7 @@ module Cardano.Logging.Test.Config (
   , config4
   ) where
 
-import           Data.Map (fromList)
+import           Data.Map.Strict (fromList)
 import           Test.QuickCheck
 
 import           Cardano.Logging