Type.Infer: Map.map is <$>

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -246,7 +246,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
 
     let
       fun x y z = addProvenance (Provenance scope $ NIf_ span (pure c) x y) z
-      -- Note: join == \ f x -> f x x
+      -- Note: join acts as \ f x -> f x x
       false = join (fun Nothing . pure) <$> f
       true = join (flip fun Nothing . pure) <$> t
 

src/Nix/Type/Infer.hs

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