diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-10-27 12:18:35 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-10-27 12:18:35 +0100 |
| commit | e012384fe99bd7d229fffa78f890d3ede915709b (patch) | |
| tree | 780705f8e12e26836e5eb9ddd2879473394bfd66 /tests/lang | |
| parent | 2f96a89646c6e55e2f1bbb80805dcbbe60fa94ae (diff) | |
| parent | e583df52800b4baa1564b027fe3b83a21756c2cc (diff) | |
Merge branch 'tojson-tostring-fix' of https://github.com/mayflower/nix
Diffstat (limited to 'tests/lang')
| -rw-r--r-- | tests/lang/eval-okay-tojson.exp | 2 | ||||
| -rw-r--r-- | tests/lang/eval-okay-tojson.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/lang/eval-okay-tojson.exp b/tests/lang/eval-okay-tojson.exp index 33588493f..e92aae323 100644 --- a/tests/lang/eval-okay-tojson.exp +++ b/tests/lang/eval-okay-tojson.exp @@ -1 +1 @@ -"{\"a\":123,\"b\":-456,\"c\":\"foo\",\"d\":\"foo\\n\\\"bar\\\"\",\"e\":true,\"f\":false,\"g\":[1,2,3],\"h\":[\"a\",[\"b\",{\"foo\\nbar\":{}}]],\"i\":3,\"j\":1.44}" +"{\"a\":123,\"b\":-456,\"c\":\"foo\",\"d\":\"foo\\n\\\"bar\\\"\",\"e\":true,\"f\":false,\"g\":[1,2,3],\"h\":[\"a\",[\"b\",{\"foo\\nbar\":{}}]],\"i\":3,\"j\":1.44,\"k\":\"foo\"}" diff --git a/tests/lang/eval-okay-tojson.nix b/tests/lang/eval-okay-tojson.nix index c046ba4ae..ce67943be 100644 --- a/tests/lang/eval-okay-tojson.nix +++ b/tests/lang/eval-okay-tojson.nix @@ -9,4 +9,5 @@ builtins.toJSON h = [ "a" [ "b" { "foo\nbar" = {}; } ] ]; i = 1 + 2; j = 1.44; + k = { __toString = self: self.a; a = "foo"; }; } |