Skip to content
This repository was archived by the owner on May 20, 2024. It is now read-only.

Commit 074e1d2

Browse files
dtolnaydtolnay
committed
Enable serde impls when benchmarking simd-json
 $ cargo check \ --bin json-benchmark \ --no-default-features \ --features performance,all-files,lib-simd-json
1 parent 12775ac commit 074e1d2

File tree

8 files changed

+76
-76
lines changed

8 files changed

+76
-76
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ all-libs = ["lib-serde", "lib-json-rust", "lib-rustc-serialize", "lib-simd-json"
2222
all-files = ["file-canada", "file-citm-catalog", "file-twitter"]
2323
performance = ["parse-dom", "stringify-dom", "parse-struct", "stringify-struct"]
2424
lib-serde = ["serde", "serde_json"]
25-
lib-simd-json = ["simd-json"]
25+
lib-simd-json = ["serde", "simd-json"]
2626
lib-json-rust = ["json"]
2727
lib-rustc-serialize = ["rustc-serialize"]
2828
file-canada = []

‎src/canada.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
#[cfg(feature = "lib-serde")]
1+
#[cfg(feature = "serde")]
22
use serde::{Deserialize, Serialize};
33

44
use std::collections::BTreeMap as Map;
55

66
pub type Canada = FeatureCollection;
77

8-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
9-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
8+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
9+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
1010
pub struct FeatureCollection {
11-
#[cfg_attr(feature = "lib-serde", serde(rename = "type"))]
11+
#[cfg_attr(feature = "serde", serde(rename = "type"))]
1212
pub obj_type: ObjType,
1313
pub features: Vec<Feature>,
1414
}
1515

16-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
17-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
16+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
17+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
1818
pub struct Feature {
19-
#[cfg_attr(feature = "lib-serde", serde(rename = "type"))]
19+
#[cfg_attr(feature = "serde", serde(rename = "type"))]
2020
pub obj_type: ObjType,
2121
pub properties: Map<String, String>,
2222
pub geometry: Geometry,
2323
}
2424

25-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
26-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
25+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
26+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
2727
pub struct Geometry {
28-
#[cfg_attr(feature = "lib-serde", serde(rename = "type"))]
28+
#[cfg_attr(feature = "serde", serde(rename = "type"))]
2929
pub obj_type: ObjType,
3030
pub coordinates: Vec<Vec<(Latitude, Longitude)>>,
3131
}

‎src/color.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
#[cfg(feature = "lib-serde")]
1+
#[cfg(feature = "serde")]
22
use std::fmt;
3-
#[cfg(any(feature = "lib-serde", feature = "lib-rustc-serialize"))]
3+
#[cfg(any(feature = "serde", feature = "lib-rustc-serialize"))]
44
use std::{ptr, slice, str};
55

66
#[cfg(feature = "lib-rustc-serialize")]
77
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
8-
#[cfg(feature = "lib-serde")]
8+
#[cfg(feature = "serde")]
99
use serde::de::{self, Deserialize, Deserializer, Unexpected};
10-
#[cfg(feature = "lib-serde")]
10+
#[cfg(feature = "serde")]
1111
use serde::ser::{Serialize, Serializer};
1212

1313
#[derive(Clone, Copy)]
1414
pub struct Color(u32);
1515

16-
#[cfg(any(feature = "lib-serde", feature = "lib-rustc-serialize"))]
16+
#[cfg(any(feature = "serde", feature = "lib-rustc-serialize"))]
1717
const HEX_LUT: &'static [u8] = b"\
1818
000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F\
1919
202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F\
@@ -24,7 +24,7 @@ const HEX_LUT: &'static [u8] = b"\
2424
C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF\
2525
E0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF";
2626

27-
#[cfg(any(feature = "lib-serde", feature = "lib-rustc-serialize"))]
27+
#[cfg(any(feature = "serde", feature = "lib-rustc-serialize"))]
2828
impl Color {
2929
fn as_str<'a>(self, buf: &'a mut [u8; 6]) -> &'a str {
3030
let buf_ptr = buf.as_mut_ptr();
@@ -44,7 +44,7 @@ impl Color {
4444
}
4545
}
4646

47-
#[cfg(feature = "lib-serde")]
47+
#[cfg(feature = "serde")]
4848
impl Serialize for Color {
4949
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
5050
where
@@ -55,7 +55,7 @@ impl Serialize for Color {
5555
}
5656
}
5757

58-
#[cfg(feature = "lib-serde")]
58+
#[cfg(feature = "serde")]
5959
impl<'de> Deserialize<'de> for Color {
6060
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
6161
where

‎src/copy/citm_catalog.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#[cfg(feature = "lib-serde")]
1+
#[cfg(feature = "serde")]
22
use serde::{Deserialize, Serialize};
33

44
use std::collections::BTreeMap as Map;
55

66
use crate::empty;
77
use crate::prim_str::PrimStr;
88

9-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
9+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
1010
#[cfg_attr(
11-
feature = "lib-serde",
11+
feature = "serde",
1212
serde(deny_unknown_fields, rename_all = "camelCase")
1313
)]
1414
pub struct CitmCatalog {
@@ -28,9 +28,9 @@ pub struct CitmCatalog {
2828
pub type Id = u32;
2929
pub type IdStr = PrimStr<u32>;
3030

31-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
31+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
3232
#[cfg_attr(
33-
feature = "lib-serde",
33+
feature = "serde",
3434
serde(deny_unknown_fields, rename_all = "camelCase")
3535
)]
3636
pub struct Event {
@@ -44,9 +44,9 @@ pub struct Event {
4444
pub topic_ids: Vec<Id>,
4545
}
4646

47-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
47+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
4848
#[cfg_attr(
49-
feature = "lib-serde",
49+
feature = "serde",
5050
serde(deny_unknown_fields, rename_all = "camelCase")
5151
)]
5252
pub struct Performance {
@@ -61,9 +61,9 @@ pub struct Performance {
6161
pub venue_code: String,
6262
}
6363

64-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
64+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
6565
#[cfg_attr(
66-
feature = "lib-serde",
66+
feature = "serde",
6767
serde(deny_unknown_fields, rename_all = "camelCase")
6868
)]
6969
pub struct Price {
@@ -72,19 +72,19 @@ pub struct Price {
7272
pub seat_category_id: Id,
7373
}
7474

75-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
75+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
7676
#[cfg_attr(
77-
feature = "lib-serde",
77+
feature = "serde",
7878
serde(deny_unknown_fields, rename_all = "camelCase")
7979
)]
8080
pub struct SeatCategory {
8181
pub areas: Vec<Area>,
8282
pub seat_category_id: Id,
8383
}
8484

85-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
85+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
8686
#[cfg_attr(
87-
feature = "lib-serde",
87+
feature = "serde",
8888
serde(deny_unknown_fields, rename_all = "camelCase")
8989
)]
9090
pub struct Area {

‎src/copy/twitter.rs

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#[cfg(feature = "lib-serde")]
1+
#[cfg(feature = "serde")]
22
use serde::{Deserialize, Serialize};
33

44
use crate::color::Color;
55
use crate::empty;
66
use crate::prim_str::PrimStr;
77

8-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
9-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
8+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
9+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
1010
#[cfg_attr(
1111
feature = "lib-rustc-serialize",
1212
derive(RustcEncodable, RustcDecodable)
@@ -21,8 +21,8 @@ pub type ShortId = u32;
2121
pub type LongIdStr = PrimStr<LongId>;
2222
pub type ShortIdStr = PrimStr<ShortId>;
2323

24-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
25-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
24+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
25+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
2626
#[cfg_attr(
2727
feature = "lib-rustc-serialize",
2828
derive(RustcEncodable, RustcDecodable)
@@ -55,8 +55,8 @@ pub struct Status {
5555
pub lang: LanguageCode,
5656
}
5757

58-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
59-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
58+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
59+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
6060
#[cfg_attr(
6161
feature = "lib-rustc-serialize",
6262
derive(RustcEncodable, RustcDecodable)
@@ -66,8 +66,8 @@ pub struct Metadata {
6666
pub iso_language_code: LanguageCode,
6767
}
6868

69-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
70-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
69+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
70+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
7171
#[cfg_attr(
7272
feature = "lib-rustc-serialize",
7373
derive(RustcEncodable, RustcDecodable)
@@ -115,8 +115,8 @@ pub struct User {
115115
pub notifications: bool,
116116
}
117117

118-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
119-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
118+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
119+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
120120
#[cfg_attr(
121121
feature = "lib-rustc-serialize",
122122
derive(RustcEncodable, RustcDecodable)
@@ -126,8 +126,8 @@ pub struct UserEntities {
126126
pub description: UserEntitiesDescription,
127127
}
128128

129-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
130-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
129+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
130+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
131131
#[cfg_attr(
132132
feature = "lib-rustc-serialize",
133133
derive(RustcEncodable, RustcDecodable)
@@ -136,8 +136,8 @@ pub struct UserUrl {
136136
pub urls: Vec<Url>,
137137
}
138138

139-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
140-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
139+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
140+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
141141
#[cfg_attr(
142142
feature = "lib-rustc-serialize",
143143
derive(RustcEncodable, RustcDecodable)
@@ -149,8 +149,8 @@ pub struct Url {
149149
pub indices: Indices,
150150
}
151151

152-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
153-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
152+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
153+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
154154
#[cfg_attr(
155155
feature = "lib-rustc-serialize",
156156
derive(RustcEncodable, RustcDecodable)
@@ -159,8 +159,8 @@ pub struct UserEntitiesDescription {
159159
pub urls: Vec<Url>,
160160
}
161161

162-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
163-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
162+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
163+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
164164
#[cfg_attr(
165165
feature = "lib-rustc-serialize",
166166
derive(RustcEncodable, RustcDecodable)
@@ -173,8 +173,8 @@ pub struct StatusEntities {
173173
pub media: Option<Vec<Media>>,
174174
}
175175

176-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
177-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
176+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
177+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
178178
#[cfg_attr(
179179
feature = "lib-rustc-serialize",
180180
derive(RustcEncodable, RustcDecodable)
@@ -184,8 +184,8 @@ pub struct Hashtag {
184184
pub indices: Indices,
185185
}
186186

187-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
188-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
187+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
188+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
189189
#[cfg_attr(
190190
feature = "lib-rustc-serialize",
191191
derive(RustcEncodable, RustcDecodable)
@@ -198,8 +198,8 @@ pub struct UserMention {
198198
pub indices: Indices,
199199
}
200200

201-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
202-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
201+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
202+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
203203
pub struct Media {
204204
pub id: LongId,
205205
pub id_str: LongIdStr,
@@ -209,15 +209,15 @@ pub struct Media {
209209
pub url: String,
210210
pub display_url: String,
211211
pub expanded_url: String,
212-
#[cfg_attr(feature = "lib-serde", serde(rename = "type"))]
212+
#[cfg_attr(feature = "serde", serde(rename = "type"))]
213213
pub media_type: String,
214214
pub sizes: Sizes,
215215
pub source_status_id: Option<LongId>,
216216
pub source_status_id_str: Option<LongIdStr>,
217217
}
218218

219-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
220-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
219+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
220+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
221221
#[cfg_attr(
222222
feature = "lib-rustc-serialize",
223223
derive(RustcEncodable, RustcDecodable)
@@ -229,8 +229,8 @@ pub struct Sizes {
229229
pub large: Size,
230230
}
231231

232-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
233-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
232+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
233+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
234234
#[cfg_attr(
235235
feature = "lib-rustc-serialize",
236236
derive(RustcEncodable, RustcDecodable)
@@ -243,8 +243,8 @@ pub struct Size {
243243

244244
pub type Indices = (u8, u8);
245245

246-
#[cfg_attr(feature = "lib-serde", derive(Serialize, Deserialize))]
247-
#[cfg_attr(feature = "lib-serde", serde(deny_unknown_fields))]
246+
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
247+
#[cfg_attr(feature = "serde", serde(deny_unknown_fields))]
248248
#[cfg_attr(
249249
feature = "lib-rustc-serialize",
250250
derive(RustcEncodable, RustcDecodable)

‎src/empty.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#[cfg(feature = "lib-rustc-serialize")]
22
use rustc_serialize::{Decodable, Decoder, Encodable, Encoder};
3-
#[cfg(feature = "lib-serde")]
3+
#[cfg(feature = "serde")]
44
use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
5-
#[cfg(feature = "lib-serde")]
5+
#[cfg(feature = "serde")]
66
use std::fmt;
77

88
#[derive(Clone, Copy)]
99
pub struct Array;
1010

11-
#[cfg(feature = "lib-serde")]
11+
#[cfg(feature = "serde")]
1212
impl Serialize for Array {
1313
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
1414
where
@@ -18,7 +18,7 @@ impl Serialize for Array {
1818
}
1919
}
2020

21-
#[cfg(feature = "lib-serde")]
21+
#[cfg(feature = "serde")]
2222
impl<'de> Deserialize<'de> for Array {
2323
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
2424
where

0 commit comments

Comments
 (0)