treewide: Haskmap.map is <$>

Author: Anton-Latukha

src/Nix/Builtins.hs

@@ -1635,7 +1635,7 @@ getContextNix v =
     case v' of
       (NVStr ns) -> do
         let context = getNixLikeContext $ toNixLikeContext $ getContext ns
-        valued :: M.HashMap Text (NValue t f m) <- sequenceA $ M.map toValue context
+        valued :: AttrSet (NValue t f m) <- sequenceA $ toValue <$> context
         pure $ nvSet mempty valued
       x -> throwError $ ErrorCall $ "Invalid type for builtins.getContext: " <> show x
 

src/Nix/Effects/Derivation.hs

@@ -271,7 +271,7 @@ defaultDerivationStrict val = do
 
     let outputsWithContext = Map.mapWithKey (\out path -> makeNixStringWithSingletonContext path (StringContext drvPath $ DerivationOutput out)) (outputs drv')
         drvPathWithContext = makeNixStringWithSingletonContext drvPath (StringContext drvPath AllOutputs)
-        attrSet = M.map nvStr $ M.fromList $ ("drvPath", drvPathWithContext): Map.toList outputsWithContext
+        attrSet = nvStr <$> M.fromList (("drvPath", drvPathWithContext) : Map.toList outputsWithContext)
     -- TODO: Add location information for all the entries.
     --              here --v
     pure $ nvSet mempty attrSet

src/Nix/Type/Infer.hs

@@ -92,7 +92,7 @@ normalizeScheme (Forall _ body) = Forall (snd <$> ord) (normtype body)
 
   normtype (a :~> b ) = normtype a :~> normtype b
   normtype (TCon a  ) = TCon a
-  normtype (TSet b a) = TSet b $ normtype `M.map` a
+  normtype (TSet b a) = TSet b $ normtype <$> a
   normtype (TList a ) = TList $ normtype <$> a
   normtype (TMany ts) = TMany $ normtype <$> ts
   normtype (TVar  a ) =
@@ -220,7 +220,7 @@ instance Substitutable TVar where
 
 instance Substitutable Type where
   apply _         (  TCon a   ) = TCon a
-  apply s         (  TSet b a ) = TSet b $ apply s `M.map` a
+  apply s         (  TSet b a ) = TSet b $ apply s <$> a
   apply s         (  TList a  ) = TList  $ apply s <$> a
   apply (Subst s) t@(TVar  a  ) = Map.findWithDefault t a s
   apply s         (  t1 :~> t2) = apply s t1 :~> apply s t2