Prelude: use readFile (Path -> Text)

Author: Anton-Latukha

main/Main.hs

@@ -81,7 +81,7 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
       (\ (binaryCacheFile :: Path) ->
         do
           let file = coerce $ (replaceExtension . coerce) binaryCacheFile "nixc"
-          processCLIOptions (Just file) =<< liftIO (readCache $ binaryCacheFile)
+          processCLIOptions (Just file) =<< liftIO (readCache binaryCacheFile)
       ) <$> readFrom
 
     -- | The `--expr` option: read expression from the argument string
@@ -95,7 +95,7 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
       (processSeveralFiles . (coerce . toString <$>) . lines <=< liftIO) .
         (\case
           "-" -> Text.getContents
-          _fp -> readFile $ coerce _fp
+          _fp -> readFile _fp
         ) <$> fromFile
 
   processExpr text = handleResult Nothing     $   parseNixTextLoc text

main/Repl.hs

@@ -96,7 +96,7 @@ main' iniVal =
 
   rcFile =
     do
-      f <- liftIO $ Text.readFile ".hnixrc" `catch` handleMissing
+      f <- liftIO $ readFile ".hnixrc" `catch` handleMissing
 
       traverse_
         (\case
@@ -116,8 +116,8 @@ main' iniVal =
 
   -- Replicated and slightly adjusted `optMatcher` from `System.Console.Repline`
   -- which doesn't export it.
-  -- * @MonadIO m@ instead of @MonadHaskeline m@
-  -- * @putStrLn@ instead of @outputStrLn@
+  --  * @MonadIO m@ instead of @MonadHaskeline m@
+  --  * @putStrLn@ instead of @outputStrLn@
   optMatcher :: MonadIO m
              => Text
              -> Console.Options m
@@ -304,11 +304,12 @@ load
   -> Repl e t f m ()
 load path =
   do
-    contents <- liftIO $ Prelude.readFile $
+    contents <- liftIO $ readFile $
        trim path
     void $ exec True contents
  where
-  trim = dropWhileEnd isSpace . dropWhile isSpace . coerce
+  trim :: Path -> Path
+  trim = coerce . dropWhileEnd isSpace . dropWhile isSpace . coerce
 
 -- | @:type@ command
 typeof

src/Nix/Parser.hs

@@ -42,7 +42,6 @@ where
 import           Prelude                 hiding ( (<|>)
                                                 , some
                                                 , many
-                                                , readFile
                                                 )
 import           Data.Foldable                  ( foldr1 )
 
@@ -72,7 +71,7 @@ import           Nix.Expr.Strings               ( escapeCodes
                                                 , mergePlain
                                                 , removeEmptyPlains
                                                 )
-import           Nix.Render                     ( MonadFile(readFile) )
+import           Nix.Render                     ( MonadFile() )
 import           Prettyprinter                  ( Doc
                                                 , pretty
                                                 )
@@ -876,7 +875,7 @@ type Result a = Either (Doc Void) a
 parseFromFileEx :: MonadFile m => Parser a -> Path -> m (Result a)
 parseFromFileEx parser file =
   do
-    input <- readFile file
+    input <- liftIO $ readFile file
 
     pure $
       either

src/Nix/Render.hs

@@ -23,7 +23,7 @@ import qualified Data.Text                     as Text
 class (MonadFail m, MonadIO m) => MonadFile m where
     readFile :: Path -> m Text
     default readFile :: (MonadTrans t, MonadIO m', MonadFile m', m ~ t m') => Path -> m Text
-    readFile = liftIO . Prelude.readFile . coerce
+    readFile = liftIO . Prelude.readFile
     listDirectory :: Path -> m [Path]
     default listDirectory :: (MonadTrans t, MonadFile m', m ~ t m') => Path -> m [Path]
     listDirectory = lift . listDirectory
@@ -50,7 +50,7 @@ class (MonadFail m, MonadIO m) => MonadFile m where
     getSymbolicLinkStatus = lift . getSymbolicLinkStatus
 
 instance MonadFile IO where
-  readFile              = liftIO . Prelude.readFile . coerce
+  readFile              = Prelude.readFile
   listDirectory         = coerce <$> (S.listDirectory . coerce)
   getCurrentDirectory   = coerce <$> S.getCurrentDirectory
   canonicalizePath      = coerce <$> (S.canonicalizePath . coerce)

src/Prelude.hs

@@ -8,7 +8,6 @@
 module Prelude
     ( module Prelude
     , module Relude
-    , Text.readFile
     , module X
     ) where
 
@@ -294,3 +293,6 @@ mapPair ~(f,g) ~(a,b) = (f a, g b)
 stub :: (Applicative f, Monoid a) => f a
 stub = pure mempty
 {-# inline stub #-}
+
+readFile :: Path -> IO Text
+readFile = Text.readFile . coerce

tests/NixLanguageTests.hs

@@ -10,7 +10,6 @@ import qualified Data.Map                      as Map
 import qualified Data.Set                      as Set
 import qualified Data.String                   as String
 import qualified Data.Text                     as Text
-import qualified Data.Text.IO                  as Text
 import           Data.Time
 import           GHC.Exts
 import           Nix.Lint
@@ -130,21 +129,21 @@ assertParseFail opts file = do
 assertLangOk :: Options -> Path -> Assertion
 assertLangOk opts file = do
   actual   <- printNix <$> hnixEvalFile opts (file <> ".nix")
-  expected <- Text.readFile $ coerce $ file <> ".exp"
-  assertEqual "" expected $ toText (actual <> "\n")
+  expected <- readFile $ file <> ".exp"
+  assertEqual "" expected $ fromString (actual <> "\n")
 
 assertLangOkXml :: Options -> Path -> Assertion
 assertLangOkXml opts file = do
   actual <- stringIgnoreContext . toXML <$> hnixEvalFile opts (file <> ".nix")
-  expected <- Text.readFile $ coerce $ file <> ".exp.xml"
+  expected <- readFile $ file <> ".exp.xml"
   assertEqual "" expected actual
 
 assertEval :: Options -> [Path] -> Assertion
 assertEval _opts files =
   do
     time <- liftIO getCurrentTime
     let opts = defaultOptions time
-    case delete ".nix" $ sort $ toText . takeExtensions . coerce <$> files of
+    case delete ".nix" $ sort $ fromString @Text . takeExtensions . coerce <$> files of
       []                 -> void $ hnixEvalFile opts (name <> ".nix")
       [".exp"          ]  -> assertLangOk    opts name
       [".exp.xml"      ]  -> assertLangOkXml opts name
@@ -153,7 +152,7 @@ assertEval _opts files =
       [".exp", ".flags"] ->
         do
           liftIO $ setEnv "NIX_PATH" "lang/dir4:lang/dir5"
-          flags <- Text.readFile $ coerce $ name <> ".flags"
+          flags <- readFile $ name <> ".flags"
           let flags' | Text.last flags == '\n' = Text.init flags
                     | otherwise               = flags
           case runParserGetResult time flags' of