diff --git a/bower.json b/bower.json index 8657b2b..ac9ee13 100644 --- a/bower.json +++ b/bower.json @@ -17,17 +17,17 @@ "package.json" ], "dependencies": { - "purescript-console": "^2.0.0", - "purescript-exceptions": "^2.0.0", - "purescript-lists": "^3.0.0", - "purescript-partial": "^1.1.2", - "purescript-profunctor": "^2.0.0", - "purescript-strings": "^2.0.2", - "purescript-transformers": "^2.0.1", - "purescript-unsafe-coerce": "^2.0.0" + "purescript-console": "^3.0.0", + "purescript-exceptions": "^3.0.0", + "purescript-lists": "^4.0.0", + "purescript-partial": "^1.2.0", + "purescript-profunctor": "^3.0.0", + "purescript-strings": "^3.0.0", + "purescript-transformers": "^3.0.0", + "purescript-unsafe-coerce": "^3.0.0" }, "devDependencies": { - "purescript-quickcheck": "^3.1.0", - "purescript-quickcheck-laws": "^2.0.0" + "purescript-quickcheck": "^4.0.0", + "purescript-quickcheck-laws": "^3.0.0" } } diff --git a/package.json b/package.json index b718f0e..da76be2 100644 --- a/package.json +++ b/package.json @@ -2,13 +2,13 @@ "private": true, "scripts": { "clean": "rimraf output && rimraf .pulp-cache", - "build": "pulp build --censor-lib --strict", + "build": "pulp build -- --censor-lib --strict", "test": "pulp test" }, "devDependencies": { - "pulp": "^9.0.1", - "purescript-psa": "^0.3.9", - "purescript": "^0.10.1", + "pulp": "^11.0.0", + "purescript-psa": "^0.5.0", + "purescript": "^0.11.1", "rimraf": "^2.5.4" } } diff --git a/src/Data/Path/Pathy.purs b/src/Data/Path/Pathy.purs index a899ecb..af4c12b 100644 --- a/src/Data/Path/Pathy.purs +++ b/src/Data/Path/Pathy.purs @@ -74,7 +74,6 @@ import Data.Array ((!!), filter, length, zipWith, range) import Data.Bifunctor (bimap) import Data.Either (Either(..), either) import Data.Foldable (foldl) -import Data.Generic (class Generic) import Data.Maybe (Maybe(..), maybe) import Data.String as S import Data.Tuple (Tuple(..), fst, snd) @@ -82,22 +81,22 @@ import Data.Tuple (Tuple(..), fst, snd) import Unsafe.Coerce (unsafeCoerce) -- | The (phantom) type of relative paths. -foreign import data Rel :: * +foreign import data Rel :: Type -- | The (phantom) type of absolute paths. -foreign import data Abs :: * +foreign import data Abs :: Type -- | The (phantom) type of files. -foreign import data File :: * +foreign import data File :: Type -- | The (phantom) type of directories. -foreign import data Dir :: * +foreign import data Dir :: Type -- | The (phantom) type of unsandboxed paths. -foreign import data Unsandboxed :: * +foreign import data Unsandboxed :: Type -- | The (phantom) type of sandboxed paths. -foreign import data Sandboxed :: * +foreign import data Sandboxed :: Type -- | A newtype around a file name. newtype FileName = FileName String @@ -548,18 +547,14 @@ instance ordPath :: Ord (Path a b s) where go _ (DirIn _ _) = GT go (FileIn p1' f1) (FileIn p2' f2) = compare p1' p2' <> compare f1 f2 -derive instance genericPath :: Generic (Path a b s) - instance showFileName :: Show FileName where show (FileName name) = "(FileName " <> show name <> ")" derive instance eqFileName :: Eq FileName derive instance ordFileName :: Ord FileName -derive instance genericFileName :: Generic FileName instance showDirName :: Show DirName where show (DirName name) = "(DirName " <> show name <> ")" derive instance eqDirName :: Eq DirName derive instance ordDirName :: Ord DirName -derive instance genericDirName :: Generic DirName diff --git a/test/Main.purs b/test/Main.purs index 1f5067a..ca41e0e 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -3,7 +3,6 @@ module Test.Main where import Prelude import Control.Monad.Eff (Eff) import Control.Monad.Eff.Console (CONSOLE, info, infoShow) -import Control.Monad.Rec.Class (Step(..), tailRecM) import Data.Foldable (foldl) import Data.Maybe (Maybe(..), fromJust) import Data.Path.Pathy (Path, Abs, Rel, Dir, File, Sandboxed, dir, rootDir, parseAbsDir, parseRelDir, currentDir, file, parseAbsFile, parseRelFile, parentDir', depth, sandbox, dropExtension, renameFile, canonicalize, unsandbox, unsafePrintPath, (), (<..>), (<.>)) @@ -14,7 +13,7 @@ import Test.QuickCheck.Gen as Gen import Test.QuickCheck.Laws.Data as Laws.Data import Type.Proxy (Proxy(..)) -test :: forall a eff. (Show a, Eq a) => String -> a -> a -> Eff (console :: CONSOLE | eff) Unit +test :: forall a eff. Show a => Eq a => String -> a -> a -> Eff (console :: CONSOLE | eff) Unit test name actual expected= do infoShow $ "Test: " <> name if expected == actual then infoShow $ "Passed: " <> (show expected) else infoShow $ "Failed: Expected " <> (show expected) <> " but found " <> (show actual)