treewide: m clean-up

Author: Anton-Latukha

src/Nix/Builtins.hs

@@ -1407,7 +1407,7 @@ findFileNix nvaset nvfilepath =
     case (aset, filePath) of
       (NVList x, NVStr ns) ->
         do
-          mres <- findPath @t @f @m x (toString (stringIgnoreContext ns))
+          mres <- findPath @t @f @m x $ toString $ stringIgnoreContext ns
 
           pure $ nvPath mres
 

src/Nix/Fresh.hs

@@ -20,7 +20,7 @@ import           Control.Monad.Ref    ( MonadAtomicRef(..)
 
 import           Nix.Thunk
 
-
+--  2021-06-02: NOTE: Remove singleton newtype accessor in favour of free coerce
 newtype FreshIdT i m a = FreshIdT { unFreshIdT :: ReaderT (Ref m i) m a }
   deriving
     ( Functor

src/Nix/Fresh/Basic.hs

@@ -33,7 +33,7 @@ instance (MonadEffects t f m, MonadDataContext f m)
   findEnvPath      = lift . findEnvPath @t @f @m
   findPath vs path = do
     i <- FreshIdT ask
-    let vs' = fmap (unliftNValue (runFreshIdT i)) vs
+    let vs' = unliftNValue (runFreshIdT i) <$> vs
     lift $ findPath @t @f @m vs' path
   importPath path = do
     i <- FreshIdT ask

src/Nix/Reduce.hs

@@ -283,14 +283,14 @@ reduce (NLet_ ann binds body) =
 
     -- let names = gatherNames body'
     -- binds' <- traverse sequence binds <&> \b -> flip filter b $ \case
-    --     NamedVar (StaticKey name _ :| mempty) _ ->
+    --     NamedVar (StaticKey name _ :| []) _ ->
     --         name `S.member` names
     --     _ -> True
     pure $ Fix $ NLet_ ann binds' body'
     -- where
     --   go m [] = pure m
     --   go m (x:xs) = case x of
-    --       NamedVar (StaticKey name _ :| mempty) def -> do
+    --       NamedVar (StaticKey name _ :| []) def -> do
     --           v <- pushScope m def
     --           go (M.insert name v m) xs
     --       _ -> go m xs

src/Nix/String/Coerce.hs

@@ -110,12 +110,13 @@ coerceToString call ctsm clevel = go
       err v = throwError $ ErrorCall $ "Expected a string, but saw: " <> show v
       castToNixString = pure . makeNixStringWithoutContext
 
-  nixStringUnwords = intercalateNixString (makeNixStringWithoutContext " ")
+  nixStringUnwords = intercalateNixString $ makeNixStringWithoutContext " "
 
   storePathToNixString :: StorePath -> NixString
-  storePathToNixString sp = makeNixStringWithSingletonContext
-    t
-    (StringContext t DirectPath)
+  storePathToNixString sp =
+    makeNixStringWithSingletonContext
+      t
+      (StringContext t DirectPath)
    where
     t = toText $ unStorePath sp
 

src/Nix/TH.hs

@@ -65,7 +65,7 @@ freeVars e = case unFix e of
       (Set.unions $ freeVars <$> mapMaybe snd set)
       (Set.difference
         (maybe mempty one varname)
-        (Set.fromList $ fmap fst set)
+        (Set.fromList $ fst <$> set)
       )
   (NLet         bindings expr   ) ->
     freeVars expr <>