{Expr.Types, Parser}: m clean-up

Author: Anton-Latukha

src/Nix/Expr/Types.hs

@@ -662,10 +662,10 @@ ekey _ _ f e = fromMaybe e <$> f Nothing
 stripPositionInfo :: NExpr -> NExpr
 stripPositionInfo = transport phi
  where
-  transport f (Fix x) = Fix $ fmap (transport f) (f x)
+  transport f (Fix x) = Fix $ transport f <$> f x
 
-  phi (NSet recur binds) = NSet recur $ fmap go binds
-  phi (NLet binds body) = NLet (fmap go binds) body
+  phi (NSet recur binds) = NSet recur $ go <$> binds
+  phi (NLet binds body) = NLet (go <$> binds) body
   phi x                 = x
 
   go (NamedVar path r     _pos) = NamedVar path r nullPos

src/Nix/Parser.hs

@@ -557,23 +557,23 @@ type Parser = ParsecT Void Text (State SourcePos)
 type Result a = Either (Doc Void) a
 
 parseFromFileEx :: MonadFile m => Parser a -> FilePath -> m (Result a)
-parseFromFileEx p path =
+parseFromFileEx parser file =
   do
-    txt <- decodeUtf8 <$> readFile path
+    input <- decodeUtf8 <$> readFile file
 
     pure $
       either
         (Left . pretty . errorBundlePretty)
-        Right
-        $ (`evalState` initialPos path) $ runParserT p path txt
+        pure
+        $ (`evalState` initialPos file) $ runParserT parser file input
 
 parseFromText :: Parser a -> Text -> Result a
-parseFromText p txt =
-  let file = "<string>" in
+parseFromText parser input =
+  let stub = "<string>" in
   either
     (Left . pretty . errorBundlePretty)
-    Right
-    $ (`evalState` initialPos file) $ (`runParserT` file) p txt
+    pure
+    $ (`evalState` initialPos stub) $ (`runParserT` stub) parser input
 
 {- Parser.Operators -}