Options: Options: (FilePath -> Path)

Author: Anton-Latukha

main/Main.hs

@@ -78,10 +78,10 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
 
     -- |  The `--read` option: load expression from a serialized file.
     loadBinaryCacheFile =
-      (\binaryCacheFile ->
+      (\ (binaryCacheFile :: Path) ->
         do
-          let file = replaceExtension binaryCacheFile "nixc"
-          processCLIOptions (Just $ coerce file) =<< liftIO (readCache $ coerce binaryCacheFile)
+          let file = coerce $ (replaceExtension . coerce) binaryCacheFile "nixc"
+          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 -> Text.readFile _fp
+          _fp -> readFile $ coerce _fp
         ) <$> fromFile
 
   processExpr text = handleResult Nothing     $   parseNixTextLoc text

src/Nix/Options.hs

@@ -13,30 +13,30 @@ data Options = Options
     , thunks       :: Bool
     , values       :: Bool
     , showScopes   :: Bool
-    , reduce       :: Maybe FilePath
+    , reduce       :: Maybe Path
     , reduceSets   :: Bool
     , reduceLists  :: Bool
     , parse        :: Bool
     , parseOnly    :: Bool
     , finder       :: Bool
-    , findFile     :: Maybe FilePath
+    , findFile     :: Maybe Path
     , strict       :: Bool
     , evaluate     :: Bool
     , json         :: Bool
     , xml          :: Bool
     , attr         :: Maybe Text
-    , include      :: [FilePath]
+    , include      :: [Path]
     , check        :: Bool
-    , readFrom     :: Maybe FilePath
+    , readFrom     :: Maybe Path
     , cache        :: Bool
     , repl         :: Bool
     , ignoreErrors :: Bool
     , expression   :: Maybe Text
     , arg          :: [(Text, Text)]
     , argstr       :: [(Text, Text)]
-    , fromFile     :: Maybe FilePath
+    , fromFile     :: Maybe Path
     , currentTime  :: UTCTime
-    , filePaths    :: [FilePath]
+    , filePaths    :: [Path]
     }
     deriving Show