Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Aeson/Decoding.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-}
-- | Conversion to and from @aeson@ 'A.Value'.
--
--
module Data.Aeson.Decoding (
decode,
eitherDecode,
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Aeson/Decoding/ByteString.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Aeson/Decoding/ByteString/Lazy.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Aeson/Decoding/Text.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Data/Aeson/Internal/Unescape.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/Data/Aeson/Internal/UnescapeFromText.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
2 changes: 1 addition & 1 deletion tests/JSONTestSuite/results/n_string_unescaped_newline.tok
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
2 changes: 1 addition & 1 deletion tests/JSONTestSuite/results/n_string_unescaped_tab.tok
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
2 changes: 1 addition & 1 deletion tests/JSONTestSuite/results/n_string_unescaped_tab.ttok
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TkArrayOpen
TkItem
TkErr "Unespected control character while parsing string literal"
TkErr "Unexpected control character while parsing string literal"
2 changes: 1 addition & 1 deletion text-iso8601/text-iso8601.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading