Standard: instance MonadValueF: switch implementations to MonadValue

Author: Anton-Latukha

src/Nix/Standard.hs

@@ -267,21 +267,15 @@ instance
       )
     -> StdValue m
     -> m r
-  demandF f v =
-    free
-      (f <=< demand <=< force)
-      (const $ f v)
-      v
+  demandF f = f <=< demand
 
   informF
     :: ( m (StdValue m)
       -> m (StdValue m)
       )
     -> StdValue m
     -> m (StdValue m)
-  --  2021-02-27: NOTE: Switch to `further` and `inform`. Probably just informF f = f <=< inform
-  informF f (Pure t) = Pure <$> furtherF f t
-  informF f (Free v) = Free <$> bindNValue' id (informF f) v
+  informF f = f . inform
 
 
 {------------------------------------------------------------------------}

src/Nix/Type/Infer.hs

@@ -436,7 +436,7 @@ instance Monad m => MonadValueF (Judgment s) (InferT s m) where
       )
     -> Judgment s
     -> InferT s m (Judgment s)
-  informF f j = f $ pure j
+  informF f = f . pure
 
 {-
 instance MonadInfer m