diff --git a/changelog.md b/changelog.md index 7581eef8..f876fdb7 100644 --- a/changelog.md +++ b/changelog.md @@ -54,7 +54,7 @@ For the latest version of this document, please see [https://github.com/haskell/ In addition to `Maybe` (and `Option`) fields the `Data.Monoid.First` and `Data.Monoid.Last` are also omitted, as well as the most newtype wrappers, when their wrap omittable type (e.g. newtypes in `Data.Monoid` and `Data.Semigroup`, `Identity`, `Const`, `Tagged`, `Compose`). - Additional "boring" types like `()` and `Proxy` are omitted as well. + Additionally "boring" types like `()` and `Proxy` are omitted as well. As the omitting is now uniform, type arguments are also omitted (also in `Generic1` derived instance). Resolves issues: @@ -72,7 +72,7 @@ For the latest version of this document, please see [https://github.com/haskell/ * Move `Data.Aeson.Parser` module into separate [`attoparsec-aeson`](https://hackage.haskell.org/package/attoparsec-aeson) package, as these parsers are not used by `aeson` itself anymore. * Use [`text-iso8601`](https://hackage.haskell.org/package/text-iso8601) package for parsing `time` types. These are slightly faster than previously used (copy of) `attoparsec-iso8601`. Formats accepted is slightly changed: - - The space between time and timezone offset (in `UTCTime` and `ZonedTime`) is disallowed. ISO8601 explicitly forbidds it. + - The space between time and timezone offset (in `UTCTime` and `ZonedTime`) is disallowed. ISO8601 explicitly forbids it. - The timezone offsets can be in range -23:59..23:59. This is how Python, joda-time etc seems to do. (Previously the range was -12..+14) * Remove internal `Data.Aeson.Internal` and `Data.Aeson.Internal.Time` modules. Everything from the former is exported elsewhere (`Data.Aeson.Types`), the latter was truly internal. diff --git a/src/Data/Aeson/Decoding.hs b/src/Data/Aeson/Decoding.hs index d9f4a466..428844f4 100644 --- a/src/Data/Aeson/Decoding.hs +++ b/src/Data/Aeson/Decoding.hs @@ -1,7 +1,7 @@ {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} -- | Conversion to and from @aeson@ 'A.Value'. --- +-- module Data.Aeson.Decoding ( decode, eitherDecode, diff --git a/src/Data/Aeson/Decoding/ByteString.hs b/src/Data/Aeson/Decoding/ByteString.hs index 3794a6c9..19ff77c4 100644 --- a/src/Data/Aeson/Decoding/ByteString.hs +++ b/src/Data/Aeson/Decoding/ByteString.hs @@ -163,7 +163,7 @@ scanStringLiteral ok err bs0 = go 0 bs0 where Just (_, bs') -> goEsc (n + 1) bs' errEnd = err "Unexpected end-of-input while parsing string literal" - errCC = err "Unespected control character while parsing string literal" + errCC = err "Unexpected control character while parsing string literal" ------------------------------------------------------------------------------- -- Number diff --git a/src/Data/Aeson/Decoding/ByteString/Lazy.hs b/src/Data/Aeson/Decoding/ByteString/Lazy.hs index ef134f53..1c0bfd11 100644 --- a/src/Data/Aeson/Decoding/ByteString/Lazy.hs +++ b/src/Data/Aeson/Decoding/ByteString/Lazy.hs @@ -169,7 +169,7 @@ scanStringLiteral ok err bs0 = go 0 bs0 where Just (_, bs') -> goEsc (n + 1) bs' errEnd = err "Unexpected end-of-input while parsing string literal" - errCC = err "Unespected control character while parsing string literal" + errCC = err "Unexpected control character while parsing string literal" ------------------------------------------------------------------------------- -- Number diff --git a/src/Data/Aeson/Decoding/Text.hs b/src/Data/Aeson/Decoding/Text.hs index fe5a897b..97ad5683 100644 --- a/src/Data/Aeson/Decoding/Text.hs +++ b/src/Data/Aeson/Decoding/Text.hs @@ -173,7 +173,7 @@ scanStringLiteral ok err bs0 = go 0 bs0 where Just (_, bs') -> goEsc (n + 1) bs' errEnd = err "Unexpected end-of-input while parsing string literal" - errCC = err "Unespected control character while parsing string literal" + errCC = err "Unexpected control character while parsing string literal" ------------------------------------------------------------------------------- -- Number diff --git a/src/Data/Aeson/Internal/Unescape.hs b/src/Data/Aeson/Internal/Unescape.hs index 3e64b6b8..24a87ead 100644 --- a/src/Data/Aeson/Internal/Unescape.hs +++ b/src/Data/Aeson/Internal/Unescape.hs @@ -29,7 +29,7 @@ import Data.Word (Word16) -- | Unescape JSON text literal. -- --- This function is exporeted mostly for testing and benchmarking purposes. +-- This function is exported mostly for testing and benchmarking purposes. unescapeText :: ByteString -> Either UnicodeException Text unescapeText = unsafeDupablePerformIO . try . unescapeTextIO diff --git a/src/Data/Aeson/Internal/UnescapeFromText.hs b/src/Data/Aeson/Internal/UnescapeFromText.hs index 1f8b0832..25a8aba6 100644 --- a/src/Data/Aeson/Internal/UnescapeFromText.hs +++ b/src/Data/Aeson/Internal/UnescapeFromText.hs @@ -24,7 +24,7 @@ import Data.Word (Word16) -- | Unescape JSON text literal. -- --- This function is exporeted mostly for testing and benchmarking purposes. +-- This function is exported mostly for testing and benchmarking purposes. unescapeFromText :: Text -> Either UnicodeException Text unescapeFromText = unsafeDupablePerformIO . try . unescapeFromTextIO diff --git a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok +++ b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok +++ b/tests/JSONTestSuite/results/n_array_spaces_vertical_tab_formfeed.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok +++ b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok +++ b/tests/JSONTestSuite/results/n_string_unescaped_ctrl_char.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_newline.tok b/tests/JSONTestSuite/results/n_string_unescaped_newline.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_newline.tok +++ b/tests/JSONTestSuite/results/n_string_unescaped_newline.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok b/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok +++ b/tests/JSONTestSuite/results/n_string_unescaped_newline.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_tab.tok b/tests/JSONTestSuite/results/n_string_unescaped_tab.tok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_tab.tok +++ b/tests/JSONTestSuite/results/n_string_unescaped_tab.tok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok b/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok index 53fa1418..042c3590 100644 --- a/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok +++ b/tests/JSONTestSuite/results/n_string_unescaped_tab.ttok @@ -1,3 +1,3 @@ TkArrayOpen TkItem -TkErr "Unespected control character while parsing string literal" +TkErr "Unexpected control character while parsing string literal" diff --git a/text-iso8601/text-iso8601.cabal b/text-iso8601/text-iso8601.cabal index a9fa1916..8b5d006d 100644 --- a/text-iso8601/text-iso8601.cabal +++ b/text-iso8601/text-iso8601.cabal @@ -3,7 +3,7 @@ name: text-iso8601 version: 0.1.1.1 synopsis: Converting time to and from ISO 8601 text. description: - Converting time to and from IS0 8601 text. + Converting time to and from ISO 8601 text. Specifically the [RFC3339](https://datatracker.ietf.org/doc/html/rfc3339) profile. license: BSD3