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

Commit 7a340b2

Browse files
authored
Merge pull request #212 from dtolnay/128
Make 128 bit support unconditional
2 parents 269de16 + 0c6bca1 commit 7a340b2

5 files changed

Lines changed: 88 additions & 119 deletions

File tree

‎src/de.rs‎

Lines changed: 24 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use serde::de::{
44
self, Deserialize, DeserializeOwned, DeserializeSeed, Expected, IgnoredAny as Ignore,
55
IntoDeserializer, Unexpected, Visitor,
66
};
7-
use serde::serde_if_integer128;
87
use std::collections::BTreeMap;
98
use std::f64;
109
use std::fmt;
@@ -261,13 +260,11 @@ impl<'de> de::Deserializer<'de> for Deserializer<'de> {
261260
self.de(|state| state.deserialize_i64(visitor))
262261
}
263262

264-
serde_if_integer128! {
265-
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value>
266-
where
267-
V: Visitor<'de>,
268-
{
269-
self.de(|state| state.deserialize_i128(visitor))
270-
}
263+
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value>
264+
where
265+
V: Visitor<'de>,
266+
{
267+
self.de(|state| state.deserialize_i128(visitor))
271268
}
272269

273270
fn deserialize_u8<V>(self, visitor: V) -> Result<V::Value>
@@ -298,13 +295,11 @@ impl<'de> de::Deserializer<'de> for Deserializer<'de> {
298295
self.de(|state| state.deserialize_u64(visitor))
299296
}
300297

301-
serde_if_integer128! {
302-
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value>
303-
where
304-
V: Visitor<'de>,
305-
{
306-
self.de(|state| state.deserialize_u128(visitor))
307-
}
298+
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value>
299+
where
300+
V: Visitor<'de>,
301+
{
302+
self.de(|state| state.deserialize_u128(visitor))
308303
}
309304

310305
fn deserialize_f32<V>(self, visitor: V) -> Result<V::Value>
@@ -1002,18 +997,14 @@ where
1002997
if let Ok(n) = v.parse() {
1003998
return visitor.visit_u64(n);
1004999
}
1005-
serde_if_integer128! {
1006-
if let Ok(n) = v.parse() {
1007-
return visitor.visit_u128(n);
1008-
}
1000+
if let Ok(n) = v.parse() {
1001+
return visitor.visit_u128(n);
10091002
}
10101003
if let Ok(n) = v.parse() {
10111004
return visitor.visit_i64(n);
10121005
}
1013-
serde_if_integer128! {
1014-
if let Ok(n) = v.parse() {
1015-
return visitor.visit_i128(n);
1016-
}
1006+
if let Ok(n) = v.parse() {
1007+
return visitor.visit_i128(n);
10171008
}
10181009
match trim_start_matches(v, '+') {
10191010
".inf" | ".Inf" | ".INF" => return visitor.visit_f64(f64::INFINITY),
@@ -1143,13 +1134,11 @@ impl<'de, 'a, 'r> de::Deserializer<'de> for &'r mut DeserializerFromEvents<'a> {
11431134
self.deserialize_scalar(visitor)
11441135
}
11451136

1146-
serde_if_integer128! {
1147-
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value>
1148-
where
1149-
V: Visitor<'de>,
1150-
{
1151-
self.deserialize_scalar(visitor)
1152-
}
1137+
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value>
1138+
where
1139+
V: Visitor<'de>,
1140+
{
1141+
self.deserialize_scalar(visitor)
11531142
}
11541143

11551144
fn deserialize_u8<V>(self, visitor: V) -> Result<V::Value>
@@ -1180,13 +1169,11 @@ impl<'de, 'a, 'r> de::Deserializer<'de> for &'r mut DeserializerFromEvents<'a> {
11801169
self.deserialize_scalar(visitor)
11811170
}
11821171

1183-
serde_if_integer128! {
1184-
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value>
1185-
where
1186-
V: Visitor<'de>,
1187-
{
1188-
self.deserialize_scalar(visitor)
1189-
}
1172+
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value>
1173+
where
1174+
V: Visitor<'de>,
1175+
{
1176+
self.deserialize_scalar(visitor)
11901177
}
11911178

11921179
fn deserialize_f32<V>(self, visitor: V) -> Result<V::Value>

‎src/ser.rs‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//! This module provides YAML serialization with the type `Serializer`.
44
55
use crate::{error, Error, Result};
6-
use serde::{ser, serde_if_integer128};
6+
use serde::ser;
77
use std::{fmt, io, num, str};
88
use yaml_rust::{yaml, Yaml, YamlEmitter};
99

@@ -109,11 +109,9 @@ where
109109
self.write(doc)
110110
}
111111

112-
serde_if_integer128! {
113-
fn serialize_i128(self, v: i128) -> Result<()> {
114-
let doc = SerializerToYaml.serialize_i128(v)?;
115-
self.write(doc)
116-
}
112+
fn serialize_i128(self, v: i128) -> Result<()> {
113+
let doc = SerializerToYaml.serialize_i128(v)?;
114+
self.write(doc)
117115
}
118116

119117
fn serialize_u8(self, v: u8) -> Result<()> {
@@ -136,11 +134,9 @@ where
136134
self.write(doc)
137135
}
138136

139-
serde_if_integer128! {
140-
fn serialize_u128(self, v: u128) -> Result<()> {
141-
let doc = SerializerToYaml.serialize_u128(v)?;
142-
self.write(doc)
143-
}
137+
fn serialize_u128(self, v: u128) -> Result<()> {
138+
let doc = SerializerToYaml.serialize_u128(v)?;
139+
self.write(doc)
144140
}
145141

146142
fn serialize_f32(self, v: f32) -> Result<()> {
@@ -479,14 +475,12 @@ impl ser::Serializer for SerializerToYaml {
479475
Ok(Yaml::Integer(v))
480476
}
481477

482-
serde_if_integer128! {
483-
#[allow(clippy::cast_possible_truncation)]
484-
fn serialize_i128(self, v: i128) -> Result<Yaml> {
485-
if v <= i64::max_value() as i128 && v >= i64::min_value() as i128 {
486-
self.serialize_i64(v as i64)
487-
} else {
488-
Ok(Yaml::Real(v.to_string()))
489-
}
478+
#[allow(clippy::cast_possible_truncation)]
479+
fn serialize_i128(self, v: i128) -> Result<Yaml> {
480+
if v <= i64::max_value() as i128 && v >= i64::min_value() as i128 {
481+
self.serialize_i64(v as i64)
482+
} else {
483+
Ok(Yaml::Real(v.to_string()))
490484
}
491485
}
492486

@@ -510,14 +504,12 @@ impl ser::Serializer for SerializerToYaml {
510504
}
511505
}
512506

513-
serde_if_integer128! {
514-
#[allow(clippy::cast_possible_truncation)]
515-
fn serialize_u128(self, v: u128) -> Result<Yaml> {
516-
if v <= i64::max_value() as u128 {
517-
self.serialize_i64(v as i64)
518-
} else {
519-
Ok(Yaml::Real(v.to_string()))
520-
}
507+
#[allow(clippy::cast_possible_truncation)]
508+
fn serialize_u128(self, v: u128) -> Result<Yaml> {
509+
if v <= i64::max_value() as u128 {
510+
self.serialize_i64(v as i64)
511+
} else {
512+
Ok(Yaml::Real(v.to_string()))
521513
}
522514
}
523515

‎src/value/de.rs‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use serde::de::{
33
self, Deserialize, DeserializeSeed, Deserializer, EnumAccess, Error as SError, Expected,
44
MapAccess, SeqAccess, Unexpected, VariantAccess, Visitor,
55
};
6-
use serde::{forward_to_deserialize_any, serde_if_integer128};
6+
use serde::forward_to_deserialize_any;
77
use std::fmt;
88
use std::vec;
99

@@ -212,13 +212,11 @@ impl<'de> Deserializer<'de> for Value {
212212
self.deserialize_number(visitor)
213213
}
214214

215-
serde_if_integer128! {
216-
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value, Error>
217-
where
218-
V: Visitor<'de>,
219-
{
220-
self.deserialize_number(visitor)
221-
}
215+
fn deserialize_i128<V>(self, visitor: V) -> Result<V::Value, Error>
216+
where
217+
V: Visitor<'de>,
218+
{
219+
self.deserialize_number(visitor)
222220
}
223221

224222
fn deserialize_u8<V>(self, visitor: V) -> Result<V::Value, Error>
@@ -249,13 +247,11 @@ impl<'de> Deserializer<'de> for Value {
249247
self.deserialize_number(visitor)
250248
}
251249

252-
serde_if_integer128! {
253-
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value, Error>
254-
where
255-
V: Visitor<'de>,
256-
{
257-
self.deserialize_number(visitor)
258-
}
250+
fn deserialize_u128<V>(self, visitor: V) -> Result<V::Value, Error>
251+
where
252+
V: Visitor<'de>,
253+
{
254+
self.deserialize_number(visitor)
259255
}
260256

261257
fn deserialize_f32<V>(self, visitor: V) -> Result<V::Value, Error>

‎tests/test_de.rs‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#![allow(clippy::cast_lossless, clippy::cast_possible_wrap)]
22

33
use indoc::indoc;
4-
use serde::serde_if_integer128;
54
use serde_derive::Deserialize;
65
use serde_yaml::Value;
76
use std::collections::BTreeMap;
@@ -196,26 +195,24 @@ fn test_number_as_string() {
196195
test_de(yaml, &expected);
197196
}
198197

199-
serde_if_integer128! {
200-
#[test]
201-
fn test_i128_big() {
202-
let expected: i128 = ::std::i64::MIN as i128 - 1;
203-
let yaml = indoc! {"
204-
---
205-
-9223372036854775809
206-
"};
207-
assert_eq!(expected, serde_yaml::from_str::<i128>(yaml).unwrap());
208-
}
198+
#[test]
199+
fn test_i128_big() {
200+
let expected: i128 = ::std::i64::MIN as i128 - 1;
201+
let yaml = indoc! {"
202+
---
203+
-9223372036854775809
204+
"};
205+
assert_eq!(expected, serde_yaml::from_str::<i128>(yaml).unwrap());
206+
}
209207

210-
#[test]
211-
fn test_u128_big() {
212-
let expected: u128 = ::std::u64::MAX as u128 + 1;
213-
let yaml = indoc! {"
214-
---
215-
18446744073709551616
216-
"};
217-
assert_eq!(expected, serde_yaml::from_str::<u128>(yaml).unwrap());
218-
}
208+
#[test]
209+
fn test_u128_big() {
210+
let expected: u128 = ::std::u64::MAX as u128 + 1;
211+
let yaml = indoc! {"
212+
---
213+
18446744073709551616
214+
"};
215+
assert_eq!(expected, serde_yaml::from_str::<u128>(yaml).unwrap());
219216
}
220217

221218
#[test]

‎tests/test_serde.rs‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
)]
66

77
use indoc::indoc;
8-
use serde::serde_if_integer128;
98
use serde_derive::{Deserialize, Serialize};
109
use serde_yaml::Value;
1110
use std::collections::BTreeMap;
@@ -78,26 +77,24 @@ fn test_int_max_i64() {
7877
test_serde(&thing, yaml);
7978
}
8079

81-
serde_if_integer128! {
82-
#[test]
83-
fn test_i128_small() {
84-
let thing: i128 = -256;
85-
let yaml = indoc! {"
86-
---
87-
-256
88-
"};
89-
test_serde(&thing, yaml);
90-
}
80+
#[test]
81+
fn test_i128_small() {
82+
let thing: i128 = -256;
83+
let yaml = indoc! {"
84+
---
85+
-256
86+
"};
87+
test_serde(&thing, yaml);
88+
}
9189

92-
#[test]
93-
fn test_u128_small() {
94-
let thing: u128 = 256;
95-
let yaml = indoc! {"
96-
---
97-
256
98-
"};
99-
test_serde(&thing, yaml);
100-
}
90+
#[test]
91+
fn test_u128_small() {
92+
let thing: u128 = 256;
93+
let yaml = indoc! {"
94+
---
95+
256
96+
"};
97+
test_serde(&thing, yaml);
10198
}
10299

103100
#[test]

0 commit comments

Comments
 (0)