salak-yaml 0.3.3 → 0.3.3.2

raw patch · 3 files changed

+13/−9 lines, 3 filesdep ~basedep ~salakPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, salak

API changes (from Hackage documentation)

Files

• salak-yaml.cabal +9/−5
• src/Salak/Yaml.hs +1/−1
• test/Spec.hs +3/−3

@@ -1,6 +1,6 @@ cabal-version: 1.12 name: salak-yaml-version: 0.3.3+version: 0.3.3.2 license: MIT license-file: LICENSE copyright: 2019 Daniel YU@@ -21,13 +21,15 @@     other-modules:         Paths_salak_yaml     default-language: Haskell2010-    default-extensions: RecordWildCards+    default-extensions: RecordWildCards TupleSections OverloadedStrings+                        ScopedTypeVariables FlexibleInstances MultiParamTypeClasses+                        DeriveGeneric     ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures     build-depends:         base >=4.10 && <5,         conduit >=1.3.1.1 && <1.4,         libyaml >=0.1.1.0 && <0.2,-        salak >=0.3.3 && <0.4,+        salak >=0.3.3.2 && <0.4,         text >=1.2.3.1 && <1.3  test-suite spec@@ -38,7 +40,9 @@         Salak.Yaml         Paths_salak_yaml     default-language: Haskell2010-    default-extensions: RecordWildCards+    default-extensions: RecordWildCards TupleSections OverloadedStrings+                        ScopedTypeVariables FlexibleInstances MultiParamTypeClasses+                        DeriveGeneric     ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures     build-depends:         QuickCheck >=2.13.2 && <2.14,@@ -48,5 +52,5 @@         hspec ==2.*,         libyaml >=0.1.1.0 && <0.2,         mtl >=2.2.2 && <2.3,-        salak >=0.3.3 && <0.4,+        salak >=0.3.3.2 && <0.4,         text >=1.2.3.1 && <1.3

@@ -66,7 +66,7 @@         Just (MarkedEvent EventMappingEnd _ _) -> return ts         Just (MarkedEvent (EventScalar a _ _ _) _ _) -> do                 val <- start T.empty-                goM $ T.modify' (Keys $ simpleKeys $ decodeUtf8 a) (const val) ts+                goM $ T.modify' (simpleKeys $ decodeUtf8 a) (const val) ts         Just e -> ge (yamlStartMark e) ("suppose scalar and mapping end, but is " ++ show (yamlEvent e))     ge YamlMark{..} e = liftIO $ throwIO $ YamlException $ "(" ++ show yamlLine ++ "," ++ show yamlColumn ++ ")" ++ e 

@@ -51,17 +51,17 @@ data SubConf = SubConf   { hello :: String } deriving (Eq, Show, Generic) -instance Monad m => FromProp m SubConf where+instance FromProp m SubConf where   fromProp = SubConf <$> "hello" .?= "yyy" -instance Monad m => FromProp m Conf+instance FromProp m Conf  jsonProperty :: SpecWith () jsonProperty = do   context "load json" $ do     it "salak.yml" $ do       loadAndRunSalak (loadYaml "test/salak.yml") $ do-        SourcePack{..}  <- askSalak+        SourcePack{..}  <- ask         as <- trace (show source) $ require "array"         cf <- require "me.icymint.conf"         lift $ do