Skip to content

Commit

Permalink
Merge branch 'ps-0.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
nsaunders committed Mar 27, 2021
2 parents af26863 + 452b2b8 commit eab8a38
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 28 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/verify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Verify

on:
push:
branches:
- master

jobs:
verify:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: asdf-vm/actions/install@v1
- run: spago build --path example/**/*.purs
- run: spago test
- run: for example in $(ls example); do spago run -m Example.${example%.*} -p example/$example; done
21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions packages.dhall
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
let mkPackage =
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.3-20190831/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57
https://raw.githubusercontent.com/purescript/package-sets/psc-0.13.0-20190626/src/mkPackage.dhall sha256:0b197efa1d397ace6eb46b243ff2d73a3da5638d8d0ac8473e8e4a8fc528cf57

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

let overrides = {=}

Expand Down
1 change: 0 additions & 1 deletion spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[ "console"
, "effect"
, "foreign-object"
, "generics-rep"
, "integers"
, "node-process"
, "numbers"
Expand Down
9 changes: 5 additions & 4 deletions src/TypedEnv.purs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module TypedEnv
import Prelude
import Data.Either (Either, note)
import Data.Generic.Rep (class Generic)
import Data.Generic.Rep.Show (genericShow)
import Data.Show.Generic (genericShow)
import Data.Int (fromString) as Int
import Data.Maybe (Maybe(..))
import Data.Number (fromString) as Number
Expand All @@ -30,7 +30,7 @@ import Data.String.Common (toLower)
import Data.Symbol (class IsSymbol, SProxy(..), reflectSymbol)
import Foreign.Object (Object, lookup)
import Prim.Row (class Cons, class Lacks) as Row
import Prim.RowList (class RowToList, kind RowList, Cons, Nil)
import Prim.RowList (class RowToList, RowList, Cons, Nil)
import Record (insert) as Record
import Type.Data.RowList (RLProxy(..))
import Type.Equality (class TypeEquals, to)
Expand Down Expand Up @@ -66,6 +66,7 @@ envErrorMessage = case _ of
EnvParseError var -> "The variable \"" <> var <> "\" was formatted incorrectly."

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

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

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

instance readEnvImpl ::
Expand All @@ -123,7 +124,7 @@ instance readEnvImpl ::
readEnv _ = readEnvFields (RLProxy :: RLProxy el) (RLProxy :: RLProxy rl)

-- | Transforms a list of environment variable specifications to a record.
class ReadEnvFields (el :: RowList) (rl :: RowList) (r :: # Type) | el -> rl where
class ReadEnvFields (el :: RowList Type) (rl :: RowList Type) (r :: Row Type) | el -> rl where
readEnvFields
:: forall proxy
. proxy el
Expand Down

0 comments on commit eab8a38

Please sign in to comment.