Core: tests: {StorePath,Derivation}: fx Text function type

Author: Anton-Latukha

hnix-store-core/tests/Derivation.hs

@@ -10,25 +10,26 @@ import           System.Nix.Derivation          ( parseDerivation
                                                 , buildDerivation
                                                 )
 
-import qualified Data.Attoparsec.Text.Lazy
+import qualified Data.Attoparsec.Text
 import qualified Data.Text.IO
 import qualified Data.Text.Lazy
 import qualified Data.Text.Lazy.Builder
 
 processDerivation :: FilePath -> FilePath -> IO ()
 processDerivation source dest = do
   contents <- Data.Text.IO.readFile source
-  case
-    Data.Attoparsec.Text.Lazy.parseOnly
-      (parseDerivation "/nix/store")
-      contents
-    of
-    Left e -> error e
-    Right drv ->
+  either
+    fail
+    (\ drv ->
       Data.Text.IO.writeFile dest
         . Data.Text.Lazy.toStrict
         . Data.Text.Lazy.Builder.toLazyText
         $ buildDerivation drv
+    )
+    (Data.Attoparsec.Text.parseOnly
+      (parseDerivation "/nix/store")
+      contents
+    )
 
 test_derivation :: TestTree
 test_derivation =

hnix-store-core/tests/StorePath.hs

@@ -5,7 +5,7 @@
 
 module StorePath where
 
-import qualified Data.Attoparsec.Text.Lazy
+import qualified Data.Attoparsec.Text
 
 import           Test.Tasty.QuickCheck
 
@@ -24,8 +24,8 @@ prop_storePathRoundtrip' x =
 
 prop_storePathRoundtripParser :: NixLike -> NixLike -> Property
 prop_storePathRoundtripParser (_ :: NixLike) = \(NixLike x) ->
-  (Data.Attoparsec.Text.Lazy.parseOnly (pathParser $ storePathRoot x) $ storePathToText x) === Right x
+  (Data.Attoparsec.Text.parseOnly (pathParser $ storePathRoot x) $ storePathToText x) === Right x
 
 prop_storePathRoundtripParser' :: StorePath -> Property
 prop_storePathRoundtripParser' x =
-  (Data.Attoparsec.Text.Lazy.parseOnly (pathParser $ storePathRoot x) $ storePathToText x) === Right x
+  (Data.Attoparsec.Text.parseOnly (pathParser $ storePathRoot x) $ storePathToText x) === Right x