treewide: (Map.union->(<>))

Author: Anton-Latukha

src/Nix/Effects/Derivation.hs

@@ -273,7 +273,7 @@ defaultDerivationStrict val = do
         pure $ drv
           { inputs
           , outputs = outputs'
-          , env = ifNotJsonModEnv $ Map.union outputs'
+          , env = ifNotJsonModEnv $ (outputs' <>)
           }
 
     drvPath <- pathToText <$> writeDerivation drv'

src/Nix/Type/Env.hs

@@ -52,16 +52,16 @@ remove :: Env -> Name -> Env
 remove (TypeEnv env) var = TypeEnv $ Map.delete var env
 
 extends :: Env -> [(Name, [Scheme])] -> Env
-extends env xs = TypeEnv $ Map.fromList xs `Map.union` coerce env
+extends env xs = TypeEnv $ Map.fromList xs <> coerce env
 
 lookup :: Name -> Env -> Maybe [Scheme]
 lookup key (TypeEnv tys) = Map.lookup key tys
 
 merge :: Env -> Env -> Env
-merge (TypeEnv a) (TypeEnv b) = TypeEnv $ a `Map.union` b
+merge (TypeEnv a) (TypeEnv b) = TypeEnv $ a <> b
 
 mergeRight :: Env -> Env -> Env
-mergeRight (TypeEnv a) (TypeEnv b) = TypeEnv $ b `Map.union` a
+mergeRight (TypeEnv a) (TypeEnv b) = TypeEnv $ b <> a
 
 mergeEnvs :: [Env] -> Env
 mergeEnvs = foldl' (<>) mempty

src/Nix/Type/Infer.hs

@@ -202,7 +202,7 @@ compose :: Subst -> Subst -> Subst
 Subst s1 `compose` Subst s2 =
   Subst $
     apply (Subst s1) <$>
-      (s2 `Map.union` s1)
+      (s2 <> s1)
 
 -- * class @Substitutable@