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: 62f01d7ed3d5
Choose a base ref
...
head repository: NixOS/nix
compare: 359c07b9fdcd
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Dec 15, 2020

  1. Remove redundant check in parseJSONString

    @knl @piegamesde
    knl authored and piegamesde committed Dec 15, 2020
    Copy the full SHA
    b595df5 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 @piegamesde
    knl authored and piegamesde committed Dec 15, 2020
    Copy the full SHA
    0f35904 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2020

  1. Merge pull request #4368 from piegamesde/backport-json-unicode-escape 

    Backport json unicode escaping to 2.3
    @edolstra
    edolstra committed Dec 16, 2020
    Copy the full SHA
    359c07b View commit details
    Browse the repository at this point in the history