Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: bc22a7ee6a6d
Choose a base ref
...
head repository: NixOS/nix
compare: 04bbfa692f4a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 6, 2020

  1. Remove redundant check in parseJSONString

    @knl
    knl committed Jan 6, 2020
    Copy the full SHA
    cb2d348 View commit details
    Browse the repository at this point in the history

  2. Add support for \u escape in fromJSON 

    As fromTOML supports \u and \U escapes, bring fromJSON on par. As JSON defaults
to UTF-8 encoding (every JSON parser must support UTF-8), this change parses the
`\u hex hex hex hex` sequence (\u followed by 4 hexadecimal digits) into an
UTF-8 representation.

Add a test to verify correct parsing, using all escape sequences from json.org.
    @knl
    knl committed Jan 6, 2020
    Copy the full SHA
    52a8f92 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. Merge pull request #3305 from knl/interpret-u-escapes-in-JSON-strings 

    Add support for unicode escape sequences in fromJSON
    @edolstra
    edolstra committed Jan 7, 2020
    Copy the full SHA
    04bbfa6 View commit details
    Browse the repository at this point in the history