treewide: m clean-up

Author: Anton-Latukha

src/Nix/Convert.hs

@@ -83,7 +83,7 @@ fromMayToDeeperValue t v =
   do
     v' <- fromValueMay v
     maybe
-      (throwError $ Expectation @t @f @m t (Free $ getDeeper v))
+      (throwError $ Expectation @t @f @m t $ Free $ getDeeper v)
       pure
       v'
 
@@ -154,7 +154,7 @@ instance Convertible e t f m
   fromValueMay =
     pure .
       \case
-        NVConstant' (NInt b) -> pure (fromInteger b)
+        NVConstant' (NInt b) -> pure $ fromInteger b
         _                    -> Nothing
 
   fromValue = fromMayToValue TInt
@@ -177,7 +177,7 @@ instance Convertible e t f m
     pure .
       \case
         NVConstant' (NFloat b) -> pure b
-        NVConstant' (NInt   i) -> pure (fromInteger i)
+        NVConstant' (NInt   i) -> pure $ fromInteger i
         _                      -> Nothing
 
   fromValue = fromMayToValue TFloat
@@ -202,7 +202,7 @@ instance ( Convertible e t f m
           (M.lookup "outPath" s)
       _ -> stub
 
-  fromValue = fromMayToValue (TString NoContext)
+  fromValue = fromMayToValue $ TString NoContext
 
 instance Convertible e t f m
   => FromValue ByteString m (NValue' t f m (NValue t f m)) where
@@ -213,7 +213,7 @@ instance Convertible e t f m
         NVStr' ns -> encodeUtf8 <$> getStringNoContext  ns
         _         -> mempty
 
-  fromValue = fromMayToValue (TString NoContext)
+  fromValue = fromMayToValue $ TString NoContext
 
 
 newtype Path = Path { getPath :: FilePath }
@@ -414,16 +414,14 @@ instance (Convertible e t f m, ToValue a m (NValue t f m))
 instance Convertible e t f m
   => ToValue NixLikeContextValue m (NValue' t f m (NValue t f m)) where
   toValue nlcv = do
-    path <-
-      bool
-        (pure Nothing)
-        (pure <$> toValue True)
-        (nlcvPath nlcv)
-    allOutputs <-
-      bool
-        (pure Nothing)
-        (pure <$> toValue True)
-        (nlcvAllOutputs nlcv)
+    let
+      g f =
+        bool
+          (pure Nothing)
+          (pure <$> toValue True)
+          (f nlcv)
+    path <- g nlcvPath
+    allOutputs <- g nlcvAllOutputs
     outputs <- do
       let
         outputs = makeNixStringWithoutContext <$> nlcvOutputs nlcv

src/Nix/Effects.hs

@@ -144,16 +144,18 @@ instance MonadExec IO where
     []            -> pure $ Left $ ErrorCall "exec: missing program"
     (prog : args) -> do
       (exitCode, out, _) <- liftIO $ readProcessWithExitCode (toString prog) (toString <$> args) ""
-      let t    = Text.strip $ toText out
-      let emsg = "program[" <> prog <> "] args=" <> show args
+      let
+        t    = Text.strip $ toText out
+        emsg = "program[" <> prog <> "] args=" <> show args
       case exitCode of
         ExitSuccess ->
+          pure $
           if Text.null t
-            then pure $ Left $ ErrorCall $ toString $ "exec has no output :" <> emsg
+            then Left $ ErrorCall $ toString $ "exec has no output :" <> emsg
             else
               either
-                (\ err -> pure $ Left $ ErrorCall $ toString $ "Error parsing output of exec: " <> show err <> " " <> emsg)
-                (pure . pure)
+                (\ err -> Left $ ErrorCall $ toString $ "Error parsing output of exec: " <> show err <> " " <> emsg)
+                pure
                 (parseNixTextLoc t)
         err -> pure $ Left $ ErrorCall $ toString $ "exec  failed: " <> show err <> " " <> emsg
 

src/Nix/String.hs

@@ -93,11 +93,7 @@ instance Monoid NixLikeContextValue where
 -- | A monad for accumulating string context while producing a result string.
 newtype WithStringContextT m a =
   WithStringContextT
-    (WriterT
-       (S.HashSet StringContext)
-       m
-       a
-    )
+    (WriterT (S.HashSet StringContext) m a )
   deriving (Functor, Applicative, Monad, MonadTrans, MonadWriter (S.HashSet StringContext))
 
 type WithStringContext = WithStringContextT Identity
@@ -143,7 +139,7 @@ makeNixString = NixString
 
 -- | Returns True if the NixString has an associated context
 stringHasContext :: NixString -> Bool
-stringHasContext (NixString _ c) = not (null c)
+stringHasContext (NixString _ c) = not $ null c
 
 
 -- ** Getters
@@ -169,8 +165,7 @@ stringIgnoreContext (NixString s _) = s
 extractNixString :: Monad m => NixString -> WithStringContextT m Text
 extractNixString (NixString s c) =
   WithStringContextT $
-    tell c $>
-      s
+    s <$ tell c
 
 
 -- ** Setters
@@ -189,7 +184,7 @@ toStringContexts ~(path, nlcv) =
       NixLikeContextValue _    True _ ->
         mkLstCtxFor AllOutputs cv { nlcvAllOutputs = False }
       NixLikeContextValue _    _    ls | not (null ls) ->
-        fmap (mkCtxFor . DerivationOutput) ls
+        mkCtxFor . DerivationOutput <$> ls
       _ -> mempty
    where
     mkCtxFor = StringContext path
@@ -256,7 +251,7 @@ intercalateNixString :: NixString -> [NixString] -> NixString
 intercalateNixString _   []   = mempty
 intercalateNixString _   [ns] = ns
 intercalateNixString sep nss  =
-  uncurry NixString (mapPair intertwine unpackNss)
+  uncurry NixString $ mapPair intertwine unpackNss
  where
 
   intertwine =

src/Nix/Type/Env.hs

@@ -59,7 +59,7 @@ merge :: Env -> Env -> Env
 merge (TypeEnv a) (TypeEnv b) = TypeEnv $ a `Map.union` b
 
 mergeEnvs :: [Env] -> Env
-mergeEnvs = foldl' merge empty
+mergeEnvs = foldl' (<>) mempty
 
 singleton :: Name -> Scheme -> Env
 singleton x y = TypeEnv $ one (x, [y])