master..c61d486 · roboservant

git.iko.soy/roboservant

10 files changed+46−24

unifiedsplit

package.yaml+1−1 roboservant.cabal+3−3 src/Roboservant/Types.hs+1 src/Roboservant/Types/Breakdown.hs+1−2 src/Roboservant/Types/BuildFrom.hs+1−1 src/Roboservant/Types/Internal.hs+2−2 src/Roboservant/Types/ReifiedApi.hs+1−1 stack.yaml+5−5 stack.yaml.lock+30−9 test/Valid.hs+1

package.yaml+1−1

@@ -1,6 +1,6 @@

22name: roboservant

3−version: 0.1.0.3

3+version: 0.1.0.2

44github: "mwotton/roboservant"

55license: BSD3

66copyright: "2020 Mark Wotton, Samuel Schlesinger"

roboservant.cabal+3−3

@@ -1,13 +1,13 @@

11cabal-version: 1.12

3−-- This file has been generated from package.yaml by hpack version 0.35.0.

3+-- This file has been generated from package.yaml by hpack version 0.34.4.

44--

55-- see: https://github.com/sol/hpack

66--

7−-- hash: 0c0c35e1dca1d6c52e5bc61591cbd8c0da9d811b83341bbc676c5f8b93b0b20d

7+-- hash: df9bc2d503c0e20b2f3edd45f6b63a5fa751b4b0254cfbb1b5e3209e5cf8de2c

99name: roboservant

10−version: 0.1.0.3

10+version: 0.1.0.2

1111synopsis: Automatic session-aware servant testing

1212description: Please see the README on GitHub at <https://github.com/mwotton/roboservant#readme>

1313category: Web

src/Roboservant/Types.hs+1

@@ -14,6 +14,7 @@ module Roboservant.Types

1414 module Roboservant.Types.ReifiedApi.Server,

1515 module Roboservant.Types.Internal,

1616 module Roboservant.Types.Config,

17+ module Roboservant.Types.Orphans,

1718 )

1819where

1920

src/Roboservant/Types/Breakdown.hs+1−2

@@ -1,6 +1,5 @@

11{-# LANGUAGE AllowAmbiguousTypes #-}

22{-# LANGUAGE DataKinds #-}

3−{-# LANGUAGE FlexibleContexts #-}

43{-# LANGUAGE DerivingVia #-}

54{-# LANGUAGE FlexibleInstances #-}

65{-# LANGUAGE GADTs #-}

@@ -49,7 +48,7 @@ instance (Hashable x, Typeable x, Breakdown x) => Breakdown [x] where

4948 breakdownExtras stash = concatMap (NEL.toList . breakdown) stash

5049

5150

52−class GBreakdown (f :: k -> Type) where

51+class GBreakdown (f :: k -> *) where

5352 gBreakdownExtras :: f a -> [(Dynamic, Int)]

5453

5554instance (Hashable x, Typeable x, Generic x, GBreakdown (Rep x)) => Breakdown (Compound (x :: Type)) where

src/Roboservant/Types/BuildFrom.hs+1−1

@@ -77,7 +77,7 @@ deriving via (Atom Int) instance BuildFrom Int

7777

7878deriving via (Atom Char) instance BuildFrom Char

7979

80−class GBuildFrom (f :: k -> Type) where

80+class GBuildFrom (f :: k -> *) where

8181 gExtras :: Stash -> [([Provenance], f a)]

8282

8383instance GBuildFrom b => GBuildFrom (M1 D a b) where

src/Roboservant/Types/Internal.hs+2−2

@@ -43,11 +43,11 @@ instance Show Stash where

4343

4444-- | Can't be built up from parts, can't be broken down further.

4545newtype Atom x = Atom {unAtom :: x}

46− deriving newtype (Hashable, Typeable,Eq)

46+ deriving newtype (Hashable, Typeable)

4747

4848-- | can be broken down and built up from generic pieces

4949newtype Compound x = Compound {unCompound :: x}

50− deriving newtype (Hashable, Typeable, Eq)

50+ deriving newtype (Hashable, Typeable)

5151

5252hashedDyn :: (Hashable a, Typeable a) => a -> (Dynamic, Int)

5353hashedDyn a = (toDyn a, hash a)

src/Roboservant/Types/ReifiedApi.hs+1−1

@@ -57,7 +57,7 @@ instance Show ReifiedEndpoint where

5757

5858class ( V.RecordToList (EndpointArgs endpoint)

5959 , V.RMap (EndpointArgs endpoint)

60− ) => ToReifiedEndpoint (endpoint :: Type) where

60+ ) => ToReifiedEndpoint (endpoint :: *) where

6161 type EndpointArgs endpoint :: [Type]

6262 type EndpointRes endpoint :: Type

6363

stack.yaml+5−5

@@ -1,10 +1,10 @@

1−resolver: lts-20.4

1+resolver: lts-17.6

22packages:

33- .

55extra-deps:

6−# - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657

7−# - dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068

6+- dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657

7+- dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068

88- servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234

9−# - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853

10−- some-1.0.3

9+- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853

10+- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055

stack.yaml.lock+30−9

@@ -4,23 +4,44 @@

44# https://docs.haskellstack.org/en/stable/lock_files

66packages:

7+- completed:

8+ hackage: dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657

9+ pantry-tree:

10+ size: 551

11+ sha256: 5defa30010904d2ad05a036f3eaf83793506717c93cbeb599f40db1a3632cfc5

12+ original:

13+ hackage: dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657

14+- completed:

15+ hackage: dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068

16+ pantry-tree:

17+ size: 290

18+ sha256: 9cbfb32b5a8a782b7a1c941803fd517633cb699159b851c1d82267a9e9391b50

19+ original:

20+ hackage: dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068

721- completed:

822 hackage: servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234

923 pantry-tree:

10− sha256: 04f12c7bef2c3f9a25d94eb9489752ed498db8e243069fe95838dbb51df1dcb3

1124 size: 325

25+ sha256: 04f12c7bef2c3f9a25d94eb9489752ed498db8e243069fe95838dbb51df1dcb3

1226 original:

1327 hackage: servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234

1428- completed:

15− hackage: some-1.0.3@sha256:938cec5fc0d3a08dde34cfc0acd5a0aa2e9fd489c9dbb64417f16588dfb47af0,2399

29+ hackage: constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853

30+ pantry-tree:

31+ size: 594

32+ sha256: 3ce1012bfb02e4d7def9df19ce80b8cd2b472c691b25b181d9960638673fecd1

33+ original:

34+ hackage: constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853

35+- completed:

36+ hackage: some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055

1637 pantry-tree:

17− sha256: b88dddc6b991cd570c6750f8d309a9feb76938b29a690abdabc4ababb8c7b2f8

18− size: 709

38+ size: 708

39+ sha256: c882b6ebe8a0616f1ab3908f1620087ad5c6d8d82d1a72b99226f6487419bfe6

1940 original:

20− hackage: some-1.0.3

41+ hackage: some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055

2142snapshots:

2243- completed:

23− sha256: 3770dfd79f5aed67acdcc65c4e7730adddffe6dba79ea723cfb0918356fc0f94

24− size: 648660

25− url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/4.yaml

26− original: lts-20.4

44+ size: 565712

45+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/6.yaml

46+ sha256: 4e5e581a709c88e3fe26a9ce8bf331435729bead762fb5c190064c6c5bb1b835

47+ original: lts-17.6

test/Valid.hs+1

@@ -10,6 +10,7 @@ module Valid where

1010import Data.Void

1111import GHC.Generics

1212import Servant

13+import Servant.API.Generic

1314import Servant.Server.Generic

1415

1516type Api =