m clean-ups

Author: Anton-Latukha

main/Repl.hs

@@ -106,12 +106,12 @@ main' iniVal =
           (prefixedCommand : xs) | Text.head prefixedCommand == commandPrefix ->
             do
               let
-                arguments = Text.unwords xs
+                arguments = unwords xs
                 command = Text.tail prefixedCommand
               optMatcher command options arguments
-          x -> cmd $ Text.unwords x
+          x -> cmd $ unwords x
         )
-        (Text.words <$> lines f)
+        (words <$> lines f)
 
   handleMissing e
     | Error.isDoesNotExistError e = pure ""
@@ -332,12 +332,14 @@ quit _ = liftIO Exit.exitSuccess
 -- | @:set@ command
 setConfig :: (MonadNix e t f m, MonadIO m) => Text -> Repl e t f m ()
 setConfig args =
-  case Text.words args of
-    []       -> liftIO $ Text.putStrLn "No option to set specified"
-    (x:_xs)  ->
+  list
+    (liftIO $ Text.putStrLn "No option to set specified")
+    (\ (x:_xs)  ->
       case filter ((==x) . helpSetOptionName) helpSetOptions of
         [opt] -> modify (\s -> s { replCfg = helpSetOptionFunction opt (replCfg s) })
         _     -> liftIO $ Text.putStrLn "No such option"
+    )
+    $ words args
 
 
 -- * Interactive Shell

src/Nix/Builtins.hs

@@ -5,7 +5,6 @@
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE MonoLocalBinds #-}
 {-# LANGUAGE MultiWayIf #-}
-{-# LANGUAGE PackageImports #-}
 {-# LANGUAGE PartialTypeSignatures #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -49,7 +48,6 @@ import qualified Data.HashMap.Lazy             as M
 import           Data.Scientific
 import qualified Data.Set                      as S
 import qualified Data.Text                     as Text
-import qualified Data.Text.Lazy                as LazyText
 import qualified Data.Text.Lazy.Builder        as Builder
 import           Data.These                     ( fromThese )
 import qualified Data.Time.Clock.POSIX         as Time
@@ -1030,7 +1028,7 @@ replaceStringsNix tfrom tto ts =
 
         --  2021-02-18: NOTE: rly?: toStrict . toLazyText
         --  Maybe `text-builder`, `text-show`?
-        finish ctx output = makeNixString (LazyText.toStrict $ Builder.toLazyText output) ctx
+        finish ctx output = makeNixString (toStrict $ Builder.toLazyText output) ctx
 
         replace (key, replacementNS, unprocessedInput) = replaceWithNixBug unprocessedInput updatedOutput
 

src/Nix/Effects.hs

@@ -33,7 +33,6 @@ import           Nix.Render
 import           Nix.Value
 import qualified Paths_hnix
 import           System.Exit
-import qualified System.Environment            as Env
 import           System.FilePath                ( takeFileName )
 import qualified System.Info
 import           System.Process
@@ -235,7 +234,7 @@ class
 -- ** Instances
 
 instance MonadEnv IO where
-  getEnvVar            = (<<$>>) toText . Env.lookupEnv . toString
+  getEnvVar            = (<<$>>) toText . lookupEnv . toString
 
   getCurrentSystemOS   = pure $ toText System.Info.os
 

tests/Main.hs

@@ -2,7 +2,6 @@
 
 module Main where
 
-import           Prelude hiding (lookupEnv)
 import           Relude.Unsafe (read)
 import qualified Control.Exception as Exc
 import           GHC.Err (errorWithoutStackTrace)
@@ -25,7 +24,7 @@ import qualified PrettyTests
 import qualified ReduceExprTests
 import qualified PrettyParseTests
 import           System.Directory
-import           System.Environment (setEnv, lookupEnv)
+import           System.Environment (setEnv)
 import           System.FilePath.Glob
 import           System.Posix.Files
 import           Test.Tasty

tests/ParserTests.hs

@@ -222,7 +222,7 @@ case_inherit_selector_syntax_mistakes =
 
 case_int_list =
   checks
-    ( mkList $ mkInt <$> [ i | i <- [1,2,3] ]
+    ( mkList $ mkInt <$> [1,2,3]
     , "[1 2 3]"
     )