Skip to content

Commit eab8a38

Browse files
committed
Merge branch 'ps-0.14'
2 parents af26863 + 452b2b8 commit eab8a38

File tree

5 files changed

+23
-28
lines changed

5 files changed

+23
-28
lines changed

.github/workflows/verify.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Verify
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
verify:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: asdf-vm/actions/install@v1
14+
- run: spago build --path example/**/*.purs
15+
- run: spago test
16+
- run: for example in $(ls example); do spago run -m Example.${example%.*} -p example/$example; done

.travis.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages.dhall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
let mkPackage =
2-
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.3-20190831/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
2+
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
33

44
let upstream =
5-
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.3-20190831/src/packages.dhall sha256:852cd4b9e463258baf4e253e8524bcfe019124769472ca50b316fe93217c3a47
5+
https://github.com/purescript/package-sets/releases/download/psc-0.14.0-20210324/packages.dhall sha256:b4564d575da6aed1c042ca7936da97c8b7a29473b63f4515f09bb95fae8dddab
66

77
let overrides = {=}
88

spago.dhall

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
[ "console"
55
, "effect"
66
, "foreign-object"
7-
, "generics-rep"
87
, "integers"
98
, "node-process"
109
, "numbers"

src/TypedEnv.purs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module TypedEnv
2121
import Prelude
2222
import Data.Either (Either, note)
2323
import Data.Generic.Rep (class Generic)
24-
import Data.Generic.Rep.Show (genericShow)
24+
import Data.Show.Generic (genericShow)
2525
import Data.Int (fromString) as Int
2626
import Data.Maybe (Maybe(..))
2727
import Data.Number (fromString) as Number
@@ -30,7 +30,7 @@ import Data.String.Common (toLower)
3030
import Data.Symbol (class IsSymbol, SProxy(..), reflectSymbol)
3131
import Foreign.Object (Object, lookup)
3232
import Prim.Row (class Cons, class Lacks) as Row
33-
import Prim.RowList (class RowToList, kind RowList, Cons, Nil)
33+
import Prim.RowList (class RowToList, RowList, Cons, Nil)
3434
import Record (insert) as Record
3535
import Type.Data.RowList (RLProxy(..))
3636
import Type.Equality (class TypeEquals, to)
@@ -66,6 +66,7 @@ envErrorMessage = case _ of
6666
EnvParseError var -> "The variable \"" <> var <> "\" was formatted incorrectly."
6767

6868
-- | Useful for a type alias representing a resolved environment
69+
type Resolved :: forall k. Symbol -> k -> k
6970
type Resolved (name :: Symbol) ty = ty
7071

7172
-- | Parses a `String` value to the specified type.
@@ -110,7 +111,7 @@ else instance readValueRequired :: ParseValue a => ReadValue a where
110111
>>= (parseValue >>> note (EnvParseError name))
111112

112113
-- | Transforms a row of environment variable specifications to a record.
113-
class ReadEnv (e :: # Type) (r :: # Type) where
114+
class ReadEnv (e :: Row Type) (r :: Row Type) where
114115
readEnv :: forall proxy. proxy e -> Object String -> Either EnvError (Record r)
115116

116117
instance readEnvImpl ::
@@ -123,7 +124,7 @@ instance readEnvImpl ::
123124
readEnv _ = readEnvFields (RLProxy :: RLProxy el) (RLProxy :: RLProxy rl)
124125

125126
-- | Transforms a list of environment variable specifications to a record.
126-
class ReadEnvFields (el :: RowList) (rl :: RowList) (r :: # Type) | el -> rl where
127+
class ReadEnvFields (el :: RowList Type) (rl :: RowList Type) (r :: Row Type) | el -> rl where
127128
readEnvFields
128129
:: forall proxy
129130
. proxy el

0 commit comments

Comments
 (0)