Skip to content

Commit cb34329

Browse files
MingunMingun
committed
Remove usage of deprecated serde_if_integer128 and bump serde dependency >=1.0.139 -> >=1.0.180 due to that
1 parent 655691c commit cb34329

File tree

14 files changed

+89
-185
lines changed

14 files changed

+89
-185
lines changed

‎Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ include = ["src/*", "LICENSE-MIT.md", "README.md"]
2222
arbitrary = { version = "1", features = ["derive"], optional = true }
2323
document-features = { version = "0.2", optional = true }
2424
encoding_rs = { version = "0.8", optional = true }
25-
serde = { version = ">=1.0.139", optional = true }
25+
# 1.0.180 is the first version that requires compiler with integer128 support (1.26)
26+
# Because serde_if_integer128 is deprecated since 1.0.221, we do not use it anymore
27+
serde = { version = ">=1.0.180", optional = true }
2628
tokio = { version = "1.10", optional = true, default-features = false, features = ["io-util"] }
2729
memchr = "2.1"
2830

‎src/de/key.rs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use crate::events::BytesStart;
55
use crate::name::QName;
66
use crate::utils::CowRef;
77
use serde::de::{DeserializeSeed, Deserializer, EnumAccess, Visitor};
8-
use serde::{forward_to_deserialize_any, serde_if_integer128};
8+
use serde::forward_to_deserialize_any;
99
use std::borrow::Cow;
1010

1111
macro_rules! deserialize_num {
@@ -155,10 +155,8 @@ impl<'de, 'd> Deserializer<'de> for QNameDeserializer<'de, 'd> {
155155
deserialize_num!(deserialize_u32, visit_u32);
156156
deserialize_num!(deserialize_u64, visit_u64);
157157

158-
serde_if_integer128! {
159-
deserialize_num!(deserialize_i128, visit_i128);
160-
deserialize_num!(deserialize_u128, visit_u128);
161-
}
158+
deserialize_num!(deserialize_i128, visit_i128);
159+
deserialize_num!(deserialize_u128, visit_u128);
162160

163161
deserialize_num!(deserialize_f32, visit_f32);
164162
deserialize_num!(deserialize_f64, visit_f64);
@@ -389,10 +387,8 @@ mod tests {
389387
deserialized_to!(u32_: u32 = "3" => 3);
390388
deserialized_to!(u64_: u64 = "3" => 3);
391389

392-
serde_if_integer128! {
393-
deserialized_to!(i128_: i128 = "-2" => -2);
394-
deserialized_to!(u128_: u128 = "2" => 2);
395-
}
390+
deserialized_to!(i128_: i128 = "-2" => -2);
391+
deserialized_to!(u128_: u128 = "2" => 2);
396392

397393
deserialized_to!(f32_: f32 = "1.23" => 1.23);
398394
deserialized_to!(f64_: f64 = "1.23" => 1.23);

‎src/de/map.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use crate::{
1515
};
1616
use serde::de::value::BorrowedStrDeserializer;
1717
use serde::de::{self, DeserializeSeed, Deserializer as _, MapAccess, SeqAccess, Visitor};
18-
use serde::serde_if_integer128;
1918
use std::borrow::Cow;
2019
use std::ops::Range;
2120

‎src/de/mod.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,10 +1973,6 @@
19731973
//! [quick-xml#586]: https://github.com/tafia/quick-xml/issues/586
19741974
//! [`impl_deserialize_for_internally_tagged_enum!`]: crate::impl_deserialize_for_internally_tagged_enum
19751975
1976-
// Macros should be defined before the modules that using them
1977-
// Also, macros should be imported before using them
1978-
use serde::serde_if_integer128;
1979-
19801976
macro_rules! deserialize_num {
19811977
($deserialize:ident => $visit:ident, $($mut:tt)?) => {
19821978
fn $deserialize<V>($($mut)? self, visitor: V) -> Result<V::Value, DeError>
@@ -2010,10 +2006,8 @@ macro_rules! deserialize_primitives {
20102006
deserialize_num!(deserialize_u32 => visit_u32, $($mut)?);
20112007
deserialize_num!(deserialize_u64 => visit_u64, $($mut)?);
20122008

2013-
serde_if_integer128! {
2014-
deserialize_num!(deserialize_i128 => visit_i128, $($mut)?);
2015-
deserialize_num!(deserialize_u128 => visit_u128, $($mut)?);
2016-
}
2009+
deserialize_num!(deserialize_i128 => visit_i128, $($mut)?);
2010+
deserialize_num!(deserialize_u128 => visit_u128, $($mut)?);
20172011

20182012
deserialize_num!(deserialize_f32 => visit_f32, $($mut)?);
20192013
deserialize_num!(deserialize_f64 => visit_f64, $($mut)?);

‎src/de/simple_type.rs‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use serde::de::value::UnitDeserializer;
1313
use serde::de::{
1414
DeserializeSeed, Deserializer, EnumAccess, IntoDeserializer, SeqAccess, VariantAccess, Visitor,
1515
};
16-
use serde::serde_if_integer128;
1716
use std::borrow::Cow;
1817
use std::ops::Range;
1918

@@ -159,10 +158,8 @@ impl<'de, 'a> Deserializer<'de> for AtomicDeserializer<'de, 'a> {
159158
deserialize_num!(deserialize_u32 => visit_u32);
160159
deserialize_num!(deserialize_u64 => visit_u64);
161160

162-
serde_if_integer128! {
163-
deserialize_num!(deserialize_i128 => visit_i128);
164-
deserialize_num!(deserialize_u128 => visit_u128);
165-
}
161+
deserialize_num!(deserialize_i128 => visit_i128);
162+
deserialize_num!(deserialize_u128 => visit_u128);
166163

167164
deserialize_num!(deserialize_f32 => visit_f32);
168165
deserialize_num!(deserialize_f64 => visit_f64);
@@ -603,10 +600,8 @@ impl<'de, 'a> Deserializer<'de> for SimpleTypeDeserializer<'de, 'a> {
603600
deserialize_primitive!(deserialize_u32);
604601
deserialize_primitive!(deserialize_u64);
605602

606-
serde_if_integer128! {
607-
deserialize_primitive!(deserialize_i128);
608-
deserialize_primitive!(deserialize_u128);
609-
}
603+
deserialize_primitive!(deserialize_i128);
604+
deserialize_primitive!(deserialize_u128);
610605

611606
deserialize_primitive!(deserialize_f32);
612607
deserialize_primitive!(deserialize_f64);
@@ -986,10 +981,8 @@ mod tests {
986981
deserialized_to!(u32_: u32 = "3" => 3);
987982
deserialized_to!(u64_: u64 = "3" => 3);
988983

989-
serde_if_integer128! {
990-
deserialized_to!(i128_: i128 = "-2" => -2);
991-
deserialized_to!(u128_: u128 = "2" => 2);
992-
}
984+
deserialized_to!(i128_: i128 = "-2" => -2);
985+
deserialized_to!(u128_: u128 = "2" => 2);
993986

994987
deserialized_to!(f32_: f32 = "1.23" => 1.23);
995988
deserialized_to!(f64_: f64 = "1.23" => 1.23);
@@ -1184,10 +1177,8 @@ mod tests {
11841177
simple!(utf8, u32_: u32 = "3" => 3);
11851178
simple!(utf8, u64_: u64 = "3" => 3);
11861179

1187-
serde_if_integer128! {
1188-
simple!(utf8, i128_: i128 = "-2" => -2);
1189-
simple!(utf8, u128_: u128 = "2" => 2);
1190-
}
1180+
simple!(utf8, i128_: i128 = "-2" => -2);
1181+
simple!(utf8, u128_: u128 = "2" => 2);
11911182

11921183
simple!(utf8, f32_: f32 = "1.23" => 1.23);
11931184
simple!(utf8, f64_: f64 = "1.23" => 1.23);
@@ -1274,10 +1265,8 @@ mod tests {
12741265
utf16!(u32_: u32 = "3" => 3);
12751266
utf16!(u64_: u64 = "3" => 3);
12761267

1277-
serde_if_integer128! {
1278-
utf16!(i128_: i128 = "-2" => -2);
1279-
utf16!(u128_: u128 = "2" => 2);
1280-
}
1268+
utf16!(i128_: i128 = "-2" => -2);
1269+
utf16!(u128_: u128 = "2" => 2);
12811270

12821271
utf16!(f32_: f32 = "1.23" => 1.23);
12831272
utf16!(f64_: f64 = "1.23" => 1.23);

‎src/de/text.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ use crate::{
66
};
77
use serde::de::value::BorrowedStrDeserializer;
88
use serde::de::{DeserializeSeed, Deserializer, EnumAccess, VariantAccess, Visitor};
9-
use serde::serde_if_integer128;
109
use std::borrow::Cow;
1110

1211
/// A deserializer for a single text node of a mixed sequence of tags and text.

‎src/se/content.rs‎

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use crate::se::{Indent, QuoteLevel, SeError, WriteResult, XmlName};
77
use serde::ser::{
88
Impossible, Serialize, SerializeSeq, SerializeTuple, SerializeTupleStruct, Serializer,
99
};
10-
use serde::serde_if_integer128;
1110
use std::fmt::Write;
1211

1312
macro_rules! write_primitive {
@@ -197,10 +196,8 @@ impl<'w, 'i, W: Write> Serializer for ContentSerializer<'w, 'i, W> {
197196
write_primitive!(serialize_u32(u32));
198197
write_primitive!(serialize_u64(u64));
199198

200-
serde_if_integer128! {
201-
write_primitive!(serialize_i128(i128));
202-
write_primitive!(serialize_u128(u128));
203-
}
199+
write_primitive!(serialize_i128(i128));
200+
write_primitive!(serialize_u128(u128));
204201

205202
write_primitive!(serialize_f32(f32));
206203
write_primitive!(serialize_f64(f64));
@@ -658,10 +655,8 @@ pub(super) mod tests {
658655
serialize_as!(u64_: 42000000000000u64 => "42000000000000", Text);
659656
serialize_as!(usize_: 42000000000000usize => "42000000000000", Text);
660657

661-
serde_if_integer128! {
662-
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
663-
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);
664-
}
658+
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
659+
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);
665660

666661
serialize_as!(f32_: 4.2f32 => "4.2", Text);
667662
serialize_as!(f64_: 4.2f64 => "4.2", Text);
@@ -793,10 +788,8 @@ pub(super) mod tests {
793788
text!(u64_: 42000000000000u64 => "42000000000000");
794789
text!(usize_: 42000000000000usize => "42000000000000");
795790

796-
serde_if_integer128! {
797-
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
798-
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
799-
}
791+
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
792+
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
800793

801794
text!(f32_: 4.2f32 => "4.2");
802795
text!(f64_: 4.2f64 => "4.2");
@@ -918,10 +911,8 @@ pub(super) mod tests {
918911
value!(u64_: 42000000000000u64 => "42000000000000");
919912
value!(usize_: 42000000000000usize => "42000000000000");
920913

921-
serde_if_integer128! {
922-
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
923-
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
924-
}
914+
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
915+
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
925916

926917
value!(f32_: 4.2f32 => "4.2");
927918
value!(f64_: 4.2f64 => "4.2");
@@ -1127,10 +1118,8 @@ pub(super) mod tests {
11271118
serialize_as!(u64_: 42000000000000u64 => "42000000000000", Text);
11281119
serialize_as!(usize_: 42000000000000usize => "42000000000000", Text);
11291120

1130-
serde_if_integer128! {
1131-
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
1132-
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);
1133-
}
1121+
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
1122+
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);
11341123

11351124
serialize_as!(f32_: 4.2f32 => "4.2", Text);
11361125
serialize_as!(f64_: 4.2f64 => "4.2", Text);
@@ -1255,10 +1244,8 @@ pub(super) mod tests {
12551244
text!(u64_: 42000000000000u64 => "42000000000000");
12561245
text!(usize_: 42000000000000usize => "42000000000000");
12571246

1258-
serde_if_integer128! {
1259-
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
1260-
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
1261-
}
1247+
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
1248+
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
12621249

12631250
text!(f32_: 4.2f32 => "4.2");
12641251
text!(f64_: 4.2f64 => "4.2");
@@ -1380,10 +1367,8 @@ pub(super) mod tests {
13801367
value!(u64_: 42000000000000u64 => "42000000000000");
13811368
value!(usize_: 42000000000000usize => "42000000000000");
13821369

1383-
serde_if_integer128! {
1384-
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
1385-
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
1386-
}
1370+
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
1371+
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
13871372

13881373
value!(f32_: 4.2f32 => "4.2");
13891374
value!(f64_: 4.2f64 => "4.2");

0 commit comments

Comments
 (0)