itsscb/json
1
0
Fork 0
mirror of https://github.com/serde-rs/json.git synced 2026-01-20 15:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
112 Commits 2 Branches 179 Tags
Commit Graph

112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Tolnay
e670e130c7
Release 0.7.3 v0.7.3 2016-06-25 15:42:01 -07:00
David Tolnay
90895bda73 Merge pull request #85 from npgm/fix-ctrl3 
Correctly escape ASCII control characters in strings
 2016-06-25 15:38:09 -07:00
Raph Levien
b8654e04eb Correctly escape ASCII control characters in strings 
This patch escapes ASCII control characters in the range 0x00...0x1f, in accordance with the JSON spec.

Fixes #51
 2016-06-25 17:10:20 -04:00
Homu
4ef396bf6a Auto merge of #83 - dtolnay:travis, r=oli-obk 
Trim down the Travis build

This takes us from 28 minutes to 5 minutes. The biggest savings is not compiling all of Clippy + Syntex in release mode for the benchmark.....
 2016-06-25 19:43:37 +09:00
David Tolnay
9dce160e5f
Trim down the Travis build 2016-06-24 21:24:11 -07:00
David Tolnay
57739801bf
Release 0.7.2 v0.7.2 2016-06-24 07:58:21 -07:00
David Tolnay
50e72e6b2c
Rename the map visitor to MapVisitor 2016-06-24 07:53:38 -07:00
David Tolnay
147c3eeee8
More consistent with imports between preserve_order and not 2016-06-24 07:52:58 -07:00
David Tolnay
7db0d2da39
Mention LinkedHashMap in doc 2016-06-24 07:49:37 -07:00
David Tolnay
3510de5740
Remove commented line in Cargo.toml 2016-06-24 07:47:26 -07:00
David Tolnay
606ceaa336 Merge pull request #80 from laktak/preserve_order 
add preserve_order feature
 2016-06-24 07:45:18 -07:00
Christian Zangl
9ee6019ecf updated dependencies 2016-06-24 09:29:26 +02:00
Christian Zangl
7dc2e0169a updated from code review 2016-06-23 22:18:55 +02:00
Christian Zangl
6fd6849078 use linked_hash_map::IntoIter 2016-06-23 20:14:08 +02:00
Christian Zangl
52a606f48c add preserve_order feature 2016-06-15 21:16:26 +02:00
David Tolnay
7343342853 Merge pull request #78 from dtolnay/expand 
Use serde_codegen::expand in json_tests/build.rs
 2016-06-11 14:25:41 -07:00
David Tolnay
3bafe903a8
Use serde_codegen::expand in json_tests/build.rs 2016-06-11 01:45:13 -07:00
Homu
1558900eef Auto merge of #75 - erickt:fix-warning, r=erickt 
Fix a warning
v0.7.1 		2016-05-26 13:58:26 +09:00
Erick Tryzelaar
4d1f98a162 Fix a warning 2016-05-25 21:57:19 -07:00
Erick Tryzelaar
940a9db1f2 Merge pull request #72 from dtolnay/release 
Release 0.7.1
 2016-05-25 14:43:38 -07:00
Homu
8077222440 Auto merge of #73 - Ms2ger:num, r=oli-obk 
Use num_traits.
 2016-05-18 23:18:41 +09:00
Ms2ger
b59dd87c40 Use num_traits. 2016-05-18 16:03:13 +02:00
David Tolnay
4e487a92d8 Release 0.7.1 2016-05-13 12:15:04 -07:00
Homu
a46b32a0cb Auto merge of #61 - arcnmx:value-missing-field, r=oli-obk 
fix(value): Missing field error when deserializing from Value

The logic for treating missing fields differed between the utf8 deserializer and the `Value` one, and missing fields would be incorrectly reported as an "invalid type" error instead. This makes the two deserializers consistent. I believe the "deserialize from unit" logic was just left over from before `deserialize_option` was a thing, and therefore isn't necessary anymore?

Fixes #50
 2016-05-13 22:38:57 +09:00
arcnmx
d6ec8db5c4 Remove unnecessary type path 2016-05-13 08:56:52 -04:00
Homu
fc9a5df6b6 Auto merge of #63 - s-panferov:feature/traits, r=erickt 
feat(value): impl Display and FromStr traits

Refs #62

I can add some tests, but implementation seems trivial. Tests fail on `nightly`, but this seems unrelated.
 2016-05-13 18:07:12 +09:00
Homu
aa427ae1cc Auto merge of #41 - pyfisch:json-pointer, r=erickt 
feat(value): implement RFC6901 JSON Pointer

Add a method `pointer(&str)` to `Value`. Deprecate `lookup(&str)`.
Bump version to 0.7.1.

Closes #9

Notes:
* It should be possible to add a `pointer_mut(&str)` method to Value. This would allow to add and modify values. (Maybe even a delete method) I failed to add such a method because of borrow checker.
* Should [RFC6902 JSON Patch](https://tools.ietf.org/html/rfc6902) be implemented or is this something for a separate crate? (Patch is based on Pointer)
 2016-05-13 17:41:41 +09:00
Homu
e77987dcb1 Auto merge of #64 - s-panferov:feature/to-json, r=oli-obk 
feat(value): create and impl ToJson trait

Refs #62

What do you think? Tests fail on `nightly`, but this seems unrelated.
 2016-05-13 17:16:06 +09:00
Stanislav Panferov
08d5c323c3 style(value): add newline 2016-05-12 20:18:56 +03:00
Erick Tryzelaar
27f4457ba1 Merge pull request #49 from dtolnay/indoc 
Use indoc for JSON document literals in test
 2016-05-12 09:38:50 -07:00
Stanislav Panferov
b0e34392cc feat(value): create and impl ToJson trait 2016-05-03 14:26:36 +03:00
Stanislav Panferov
bc78fe9635 feat(value): impl Display and FromStr traits 2016-05-03 14:20:30 +03:00
arcnmx
51cee7d098 fix(value): Missing field error when deserializing from Value 2016-05-02 15:24:09 -04:00
David Tolnay
f044792a59 Use indoc for JSON document literals in test 2016-03-19 04:05:13 -07:00
Pyfisch
6fa1af01a8 feat(value): implement RFC6901 JSON Pointer 
Add a method `pointer(&str)` to `Value`. Deprecate `lookup(&str)`.
Bump version to 0.7.1.

Closes #9
 2016-02-27 16:10:02 +01:00
Erick Tryzelaar
7bc9b0a98e fix(tests): Fix the skeptic tests on stable rust v0.7.0 2016-02-26 22:41:58 -08:00
Erick Tryzelaar
c53ce95dbb Merge remote-tracking branch 'remotes/origin/master' 2016-02-26 22:06:50 -08:00
Erick Tryzelaar
e19a3cc7d5 feat(tests): Add support for skeptic to test readme 2016-02-26 22:06:31 -08:00
Erick Tryzelaar
83c650a819 fix(tests): Update to latest error types 2016-02-26 21:45:24 -08:00
Erick Tryzelaar
6e3302c81e feat(error): Update to latest Error::custom signature 2016-02-26 21:27:10 -08:00
Erick Tryzelaar
7821f5a6d6 fix(error): Fix missing variant/field, rename error variants 2016-02-25 07:45:44 -08:00
Erick Tryzelaar
cce04b12ce Merge pull request #38 from dtolnay/readme 
Fix examples in readme
 2016-02-24 09:46:21 -08:00
David Tolnay
378d987a54 Fix examples in readme 2016-02-23 22:05:58 -08:00
Erick Tryzelaar
b309a3e635 Merge branch 'master' into 0.7.x 
# Conflicts:
#	json/Cargo.toml
#	json/src/de.rs
 2016-02-23 07:51:59 -08:00
Erick Tryzelaar
a3eca5e4e1 refactor(stream): Rename JSONStream to StreamDeserializer 
This is a tad more consistent with the rest of the library.
 2016-02-23 07:48:15 -08:00
Erick Tryzelaar
979eefe047 Merge branch 'feature-parse-stream' 2016-02-23 07:32:52 -08:00
Erick Tryzelaar
ac7d5d448b feat(testing): Add clippy support 2016-02-23 05:57:30 -08:00
Erick Tryzelaar
b936a41d31 Merge pull request #31 from cmbrandenburg/missing_field_fixes 
Fix: Report correct error code for missing field
 2016-02-23 05:31:30 -08:00
Erick Tryzelaar
fca912b898 Merge pull request #25 from tomjakubowski/unsize_to_value 
Remove the Sized bound on to_value<T>()
 2016-02-23 05:29:31 -08:00
Erick Tryzelaar
0dd53bf988 Merge pull request #35 from nixpulvis/negative-zero 
Fix negative zero
 2016-02-23 05:27:58 -08:00