Skip to content

Commit 8712dde

Browse files
authored
Merge pull request #24 from natefaubion/0.11-updates
Updates for 0.11
2 parents b6d2628 + 9bb13c9 commit 8712dde

File tree

4 files changed

+21
-27
lines changed

4 files changed

+21
-27
lines changed

bower.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
"package.json"
1818
],
1919
"dependencies": {
20-
"purescript-console": "^2.0.0",
21-
"purescript-exceptions": "^2.0.0",
22-
"purescript-lists": "^3.0.0",
23-
"purescript-partial": "^1.1.2",
24-
"purescript-profunctor": "^2.0.0",
25-
"purescript-strings": "^2.0.2",
26-
"purescript-transformers": "^2.0.1",
27-
"purescript-unsafe-coerce": "^2.0.0"
20+
"purescript-console": "^3.0.0",
21+
"purescript-exceptions": "^3.0.0",
22+
"purescript-lists": "^4.0.0",
23+
"purescript-partial": "^1.2.0",
24+
"purescript-profunctor": "^3.0.0",
25+
"purescript-strings": "^3.0.0",
26+
"purescript-transformers": "^3.0.0",
27+
"purescript-unsafe-coerce": "^3.0.0"
2828
},
2929
"devDependencies": {
30-
"purescript-quickcheck": "^3.1.0",
31-
"purescript-quickcheck-laws": "^2.0.0"
30+
"purescript-quickcheck": "^4.0.0",
31+
"purescript-quickcheck-laws": "^3.0.0"
3232
}
3333
}

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "pulp build --censor-lib --strict",
5+
"build": "pulp build -- --censor-lib --strict",
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"pulp": "^9.0.1",
10-
"purescript-psa": "^0.3.9",
11-
"purescript": "^0.10.1",
9+
"pulp": "^11.0.0",
10+
"purescript-psa": "^0.5.0",
11+
"purescript": "^0.11.1",
1212
"rimraf": "^2.5.4"
1313
}
1414
}

src/Data/Path/Pathy.purs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,30 +74,29 @@ import Data.Array ((!!), filter, length, zipWith, range)
7474
import Data.Bifunctor (bimap)
7575
import Data.Either (Either(..), either)
7676
import Data.Foldable (foldl)
77-
import Data.Generic (class Generic)
7877
import Data.Maybe (Maybe(..), maybe)
7978
import Data.String as S
8079
import Data.Tuple (Tuple(..), fst, snd)
8180

8281
import Unsafe.Coerce (unsafeCoerce)
8382

8483
-- | The (phantom) type of relative paths.
85-
foreign import data Rel :: *
84+
foreign import data Rel :: Type
8685

8786
-- | The (phantom) type of absolute paths.
88-
foreign import data Abs :: *
87+
foreign import data Abs :: Type
8988

9089
-- | The (phantom) type of files.
91-
foreign import data File :: *
90+
foreign import data File :: Type
9291

9392
-- | The (phantom) type of directories.
94-
foreign import data Dir :: *
93+
foreign import data Dir :: Type
9594

9695
-- | The (phantom) type of unsandboxed paths.
97-
foreign import data Unsandboxed :: *
96+
foreign import data Unsandboxed :: Type
9897

9998
-- | The (phantom) type of sandboxed paths.
100-
foreign import data Sandboxed :: *
99+
foreign import data Sandboxed :: Type
101100

102101
-- | A newtype around a file name.
103102
newtype FileName = FileName String
@@ -548,18 +547,14 @@ instance ordPath :: Ord (Path a b s) where
548547
go _ (DirIn _ _) = GT
549548
go (FileIn p1' f1) (FileIn p2' f2) = compare p1' p2' <> compare f1 f2
550549

551-
derive instance genericPath :: Generic (Path a b s)
552-
553550
instance showFileName :: Show FileName where
554551
show (FileName name) = "(FileName " <> show name <> ")"
555552

556553
derive instance eqFileName :: Eq FileName
557554
derive instance ordFileName :: Ord FileName
558-
derive instance genericFileName :: Generic FileName
559555

560556
instance showDirName :: Show DirName where
561557
show (DirName name) = "(DirName " <> show name <> ")"
562558

563559
derive instance eqDirName :: Eq DirName
564560
derive instance ordDirName :: Ord DirName
565-
derive instance genericDirName :: Generic DirName

test/Main.purs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module Test.Main where
33
import Prelude
44
import Control.Monad.Eff (Eff)
55
import Control.Monad.Eff.Console (CONSOLE, info, infoShow)
6-
import Control.Monad.Rec.Class (Step(..), tailRecM)
76
import Data.Foldable (foldl)
87
import Data.Maybe (Maybe(..), fromJust)
98
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
1413
import Test.QuickCheck.Laws.Data as Laws.Data
1514
import Type.Proxy (Proxy(..))
1615

17-
test :: forall a eff. (Show a, Eq a) => String -> a -> a -> Eff (console :: CONSOLE | eff) Unit
16+
test :: forall a eff. Show a => Eq a => String -> a -> a -> Eff (console :: CONSOLE | eff) Unit
1817
test name actual expected= do
1918
infoShow $ "Test: " <> name
2019
if expected == actual then infoShow $ "Passed: " <> (show expected) else infoShow $ "Failed: Expected " <> (show expected) <> " but found " <> (show actual)

0 commit comments

Comments
 (0)