Skip to content

Commit ad02a2f

Browse files
maciejhirszmaciejhirsz
authored
Merge pull request #72 from maciejhirsz/0.9.0
0.9.0
2 parents 64e23fc + eaef343 commit ad02a2f

13 files changed

+1130
-240
lines changed

‎Cargo.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[package]
22
name = "json"
3-
version = "0.8.8"
3+
version = "0.9.0"
44
authors = ["Maciej Hirsz <[email protected]>"]
55
description = "JSON implementation in Rust"
66
repository = "https://github.com/maciejhirsz/json-rust"
77
documentation = "http://terhix.com/doc/json/"
8-
license = "MIT"
8+
license = "MIT/Apache-2.0"
99

1010
[dependencies]
1111
itoa = "0.1"
12+
ftoa = "0.1"

‎LICENSE-APACHE

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2016 Maciej Hirsz <[email protected]>
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎LICENSE renamed to ‎LICENSE-MIT

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Copyright (c) 2016 Maciej Hirsz <[email protected]>
22

3-
he MIT License (MIT)
3+
The MIT License (MIT)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

+20-6
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ assert!(data["this"]["does"]["not"]["exist"].is_null());
8888
data["list"][0] = "Hello".into();
8989

9090
// Use the `dump` method to serialize the data:
91-
assert_eq!(data.dump(), r#"{"answer":42,"bar":null,"foo":false,"list":["Hello","world",true]}"#);
91+
assert_eq!(data.dump(), r#"{"foo":false,"bar":null,"answer":42,"list":["Hello","world",true]}"#);
9292

9393
// Or pretty print it out:
9494
println!("{:#}", data);
@@ -110,12 +110,26 @@ Then import it in your `main.rs` / `lib.rs` file:
110110
extern crate json;
111111
```
112112

113-
## Performance
113+
## Performance and Conformance
114114

115-
While performance is not the main goal of this crate, it is still relevant, and it's doing pretty well in the company:
115+
There used to be a statement here saying that performance is not the main goal of this
116+
crate. It is definitely one of them now.
116117

117-
![](http://terhix.com/json-perf-9.png)
118+
While this crate doesn't provide a way to parse JSON to native Rust structs, it does a
119+
lot to optimize it's performance for DOM parsing, stringifying and manipulation. It does
120+
[very well in benchmarks](https://github.com/serde-rs/json-benchmark), in some cases it
121+
can even outperform parsing to structs.
118122

119-
[The benchmarks](https://github.com/maciejhirsz/json-rust/blob/benches/benches/log.rs) were run on 2012 MacBook Air, your results may vary. Many thanks to [@dtolnay](https://github.com/dtolnay) for providing the baseline struct and test data the tests could be run on.
123+
This crate implements the standard according to the [
124+
RFC 7159](https://tools.ietf.org/html/rfc7159) and
125+
[ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf)
126+
documents. It makes some compromises when it comes to number precision, but they are
127+
both within the specification and advised practices for best interoperability,
128+
specifically those discussed in the RFC.
120129

121-
While this is not necessarily a be-all end-all benchmark, the main takeaway from this is that Serde parsing is much faster when parsing to a struct, since the parser knows exactly the kind of data it needs, and doesn't pay the (re)allocation costs of pushing data to a map. Also worth noting, rustc-serialize suffers since it first has to parse JSON to generic enum-based values, and only then map those onto structs.
130+
## License
131+
132+
This crate is distributed under the terms of both the MIT license
133+
and the Apache License (Version 2.0), choose whatever works for you.
134+
135+
See [LICENSE-APACHE](LICENSE-APACHE) and [LICENSE-MIT](LICENSE-MIT) for details.

‎src/codegen.rs

+29-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
use std::ptr;
12
use std::io::Write;
23
use std::num::FpCategory;
34
use JsonValue;
45

56
extern crate itoa;
7+
extern crate ftoa;
68

79
const QU: u8 = b'"';
810
const BS: u8 = b'\\';
@@ -100,12 +102,7 @@ pub trait Generator {
100102
if num.fract() == 0.0 && num.abs() < 1e19 {
101103
itoa::write(self.get_writer(), num as i64).unwrap();
102104
} else {
103-
let abs = num.abs();
104-
if abs < 1e-15 || abs > 1e19 {
105-
write!(self.get_writer(), "{:e}", num).unwrap();
106-
} else {
107-
write!(self.get_writer(), "{}", num).unwrap();
108-
}
105+
ftoa::write(self.get_writer(), num).unwrap();
109106
}
110107
},
111108
FpCategory::Zero => {
@@ -124,11 +121,12 @@ pub trait Generator {
124121

125122
fn write_json(&mut self, json: &JsonValue) {
126123
match *json {
124+
JsonValue::Null => self.write(b"null"),
125+
JsonValue::Short(ref short) => self.write_string(short.as_str()),
127126
JsonValue::String(ref string) => self.write_string(string),
128127
JsonValue::Number(ref number) => self.write_number(*number),
129128
JsonValue::Boolean(true) => self.write(b"true"),
130129
JsonValue::Boolean(false) => self.write(b"false"),
131-
JsonValue::Null => self.write(b"null"),
132130
JsonValue::Array(ref array) => {
133131
self.write_char(b'[');
134132
let mut iter = array.iter();
@@ -204,9 +202,8 @@ impl DumpGenerator {
204202
impl Generator for DumpGenerator {
205203
type T = Vec<u8>;
206204

207-
#[inline(always)]
208205
fn write(&mut self, slice: &[u8]) {
209-
self.code.extend_from_slice(slice)
206+
extend_from_slice(&mut self.code, slice);
210207
}
211208

212209
#[inline(always)]
@@ -250,7 +247,7 @@ impl Generator for PrettyGenerator {
250247

251248
#[inline(always)]
252249
fn write(&mut self, slice: &[u8]) {
253-
self.code.extend_from_slice(slice)
250+
extend_from_slice(&mut self.code, slice);
254251
}
255252

256253
#[inline(always)]
@@ -309,3 +306,25 @@ impl<'a, W> Generator for WriterGenerator<'a, W> where W: Write {
309306
self.writer.write_all(&[min]).unwrap();
310307
}
311308
}
309+
310+
// From: https://github.com/dtolnay/fastwrite/blob/master/src/lib.rs#L68
311+
//
312+
// LLVM is not able to lower `Vec::extend_from_slice` into a memcpy, so this
313+
// helps eke out that last bit of performance.
314+
#[inline]
315+
fn extend_from_slice(dst: &mut Vec<u8>, src: &[u8]) {
316+
let dst_len = dst.len();
317+
let src_len = src.len();
318+
319+
dst.reserve(src_len);
320+
321+
unsafe {
322+
// We would have failed if `reserve` overflowed
323+
dst.set_len(dst_len + src_len);
324+
325+
ptr::copy_nonoverlapping(
326+
src.as_ptr(),
327+
dst.as_mut_ptr().offset(dst_len as isize),
328+
src_len);
329+
}
330+
}

0 commit comments

Comments
 (0)