Merge pull request #186 from bergey/master

prefer String instance of ToYaml over [Char]
snoyberg · May 7, 2020 · bacf680 · bacf680
2 parents 17318fc + 6b7beb8
commit bacf680
Show file tree

Hide file tree

Showing 4 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.4.0
+
+* add `ToYaml` instance for `String` [#186](https://github.com/snoyberg/yaml/pull/186)
+
 ## 0.11.3.0
 
 * Don't wrap up async exceptions [#185](https://github.com/snoyberg/yaml/issues/185)

diff --git a/yaml/package.yaml b/yaml/package.yaml
@@ -1,5 +1,5 @@
 name:        yaml
-version:     0.11.3.0
+version:     0.11.4.0
 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/Builder.hs b/yaml/src/Data/Yaml/Builder.hs
@@ -75,7 +75,7 @@ instance ToYaml a => ToYaml [a] where
     toYaml = array . map toYaml
 instance ToYaml Text where
     toYaml = string
-instance ToYaml String where
+instance {-# OVERLAPPING #-} ToYaml String where
     toYaml = string . T.pack
 instance ToYaml Int where
     toYaml i = YamlBuilder (EventScalar (S8.pack $ show i) NoTag PlainNoTag Nothing:)

diff --git a/yaml/yaml.cabal b/yaml/yaml.cabal
@@ -4,10 +4,10 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 4160e171cfd5a87614a9fbf40f548f75306e24d499c44f71c279d15f8c4e2c39
+-- hash: 1f75743c2fefefb33f6f3e8a51fce90cb3f286c975d205d7ded3789d5b15c488
 
 name:           yaml
-version:        0.11.3.0
+version:        0.11.4.0
 synopsis:       Support for parsing and rendering YAML documents.
 description:    README and API documentation are available at <https://www.stackage.org/package/yaml>
 category:       Data