Better error message for Data.Yaml.Config #168

snoyberg · Apr 23, 2019 · 4210fa0 · 4210fa0
1 parent b1aa6e9
commit 4210fa0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/yaml/ChangeLog.md b/yaml/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog for yaml
 
+## 0.11.0.1
+
+* Better error messages in the `Data.Yaml.Config` module [#168](https://github.com/snoyberg/yaml/issues/168)
+
 ## 0.11.0.0
 
 * Split out the `libyaml` and `Text.Libyaml` code into its own package. [#145](https://github.com/snoyberg/yaml/issues/145)

diff --git a/yaml/package.yaml b/yaml/package.yaml
@@ -1,5 +1,5 @@
 name:        yaml
-version:     0.11.0.0
+version:     0.11.0.1
 synopsis:    Support for parsing and rendering YAML documents.
 description: README and API documentation are available at <https://www.stackage.org/package/yaml>
 category:    Data

diff --git a/yaml/src/Data/Yaml/Config.hs b/yaml/src/Data/Yaml/Config.hs
@@ -197,9 +197,9 @@ loadYamlSettings runTimeFiles compileValues envUsage = do
             UseCustomEnv env     -> return $ applyEnvValue   False env    value'
             RequireCustomEnv env -> return $ applyEnvValue   True  env    value'
 
-    case fromJSON value of
-        Error s -> error $ "Could not convert to expected type: " ++ s
-        Success settings -> return settings
+    case Y.parseEither parseJSON value of
+        Left s -> error $ "Could not convert to expected type: " ++ s
+        Right settings -> return settings
 
 -- | Same as @loadYamlSettings@, but get the list of runtime config files from
 -- the command line arguments.