Skip to content

Remove usage of deprecated serde_if_integer128 and bump serde dependecy #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+89 −185
Open

Remove usage of deprecated serde_if_integer128 and bump serde dependecy #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ include = ["src/*", "LICENSE-MIT.md", "README.md"]
arbitrary = { version = "1", features = ["derive"], optional = true }
document-features = { version = "0.2", optional = true }
encoding_rs = { version = "0.8", optional = true }
serde = { version = ">=1.0.139", optional = true }
# 1.0.180 is the first version that requires compiler with integer128 support (1.26)
# Because serde_if_integer128 is deprecated since 1.0.221, we do not use it anymore
serde = { version = ">=1.0.180", optional = true }
tokio = { version = "1.10", optional = true, default-features = false, features = ["io-util"] }
memchr = "2.1"

Expand Down
14 changes: 5 additions & 9 deletions src/de/key.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::events::BytesStart;
use crate::name::QName;
use crate::utils::CowRef;
use serde::de::{DeserializeSeed, Deserializer, EnumAccess, Visitor};
use serde::{forward_to_deserialize_any, serde_if_integer128};
use serde::forward_to_deserialize_any;
use std::borrow::Cow;

macro_rules! deserialize_num {
Expand Down Expand Up @@ -155,10 +155,8 @@ impl<'de, 'd> Deserializer<'de> for QNameDeserializer<'de, 'd> {
deserialize_num!(deserialize_u32, visit_u32);
deserialize_num!(deserialize_u64, visit_u64);

serde_if_integer128! {
deserialize_num!(deserialize_i128, visit_i128);
deserialize_num!(deserialize_u128, visit_u128);
}
deserialize_num!(deserialize_i128, visit_i128);
deserialize_num!(deserialize_u128, visit_u128);

deserialize_num!(deserialize_f32, visit_f32);
deserialize_num!(deserialize_f64, visit_f64);
Expand Down Expand Up @@ -389,10 +387,8 @@ mod tests {
deserialized_to!(u32_: u32 = "3" => 3);
deserialized_to!(u64_: u64 = "3" => 3);

serde_if_integer128! {
deserialized_to!(i128_: i128 = "-2" => -2);
deserialized_to!(u128_: u128 = "2" => 2);
}
deserialized_to!(i128_: i128 = "-2" => -2);
deserialized_to!(u128_: u128 = "2" => 2);

deserialized_to!(f32_: f32 = "1.23" => 1.23);
deserialized_to!(f64_: f64 = "1.23" => 1.23);
Expand Down
1 change: 0 additions & 1 deletion src/de/map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use crate::{
};
use serde::de::value::BorrowedStrDeserializer;
use serde::de::{self, DeserializeSeed, Deserializer as _, MapAccess, SeqAccess, Visitor};
use serde::serde_if_integer128;
use std::borrow::Cow;
use std::ops::Range;

Expand Down
10 changes: 2 additions & 8 deletions src/de/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1973,10 +1973,6 @@
//! [quick-xml#586]: https://github.com/tafia/quick-xml/issues/586
//! [`impl_deserialize_for_internally_tagged_enum!`]: crate::impl_deserialize_for_internally_tagged_enum

// Macros should be defined before the modules that using them
// Also, macros should be imported before using them
use serde::serde_if_integer128;

macro_rules! deserialize_num {
($deserialize:ident => $visit:ident, $($mut:tt)?) => {
fn $deserialize<V>($($mut)? self, visitor: V) -> Result<V::Value, DeError>
Expand Down Expand Up @@ -2010,10 +2006,8 @@ macro_rules! deserialize_primitives {
deserialize_num!(deserialize_u32 => visit_u32, $($mut)?);
deserialize_num!(deserialize_u64 => visit_u64, $($mut)?);

serde_if_integer128! {
deserialize_num!(deserialize_i128 => visit_i128, $($mut)?);
deserialize_num!(deserialize_u128 => visit_u128, $($mut)?);
}
deserialize_num!(deserialize_i128 => visit_i128, $($mut)?);
deserialize_num!(deserialize_u128 => visit_u128, $($mut)?);

deserialize_num!(deserialize_f32 => visit_f32, $($mut)?);
deserialize_num!(deserialize_f64 => visit_f64, $($mut)?);
Expand Down
31 changes: 10 additions & 21 deletions src/de/simple_type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use serde::de::value::UnitDeserializer;
use serde::de::{
DeserializeSeed, Deserializer, EnumAccess, IntoDeserializer, SeqAccess, VariantAccess, Visitor,
};
use serde::serde_if_integer128;
use std::borrow::Cow;
use std::ops::Range;

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

serde_if_integer128! {
deserialize_num!(deserialize_i128 => visit_i128);
deserialize_num!(deserialize_u128 => visit_u128);
}
deserialize_num!(deserialize_i128 => visit_i128);
deserialize_num!(deserialize_u128 => visit_u128);

deserialize_num!(deserialize_f32 => visit_f32);
deserialize_num!(deserialize_f64 => visit_f64);
Expand Down Expand Up @@ -603,10 +600,8 @@ impl<'de, 'a> Deserializer<'de> for SimpleTypeDeserializer<'de, 'a> {
deserialize_primitive!(deserialize_u32);
deserialize_primitive!(deserialize_u64);

serde_if_integer128! {
deserialize_primitive!(deserialize_i128);
deserialize_primitive!(deserialize_u128);
}
deserialize_primitive!(deserialize_i128);
deserialize_primitive!(deserialize_u128);

deserialize_primitive!(deserialize_f32);
deserialize_primitive!(deserialize_f64);
Expand Down Expand Up @@ -986,10 +981,8 @@ mod tests {
deserialized_to!(u32_: u32 = "3" => 3);
deserialized_to!(u64_: u64 = "3" => 3);

serde_if_integer128! {
deserialized_to!(i128_: i128 = "-2" => -2);
deserialized_to!(u128_: u128 = "2" => 2);
}
deserialized_to!(i128_: i128 = "-2" => -2);
deserialized_to!(u128_: u128 = "2" => 2);

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

serde_if_integer128! {
simple!(utf8, i128_: i128 = "-2" => -2);
simple!(utf8, u128_: u128 = "2" => 2);
}
simple!(utf8, i128_: i128 = "-2" => -2);
simple!(utf8, u128_: u128 = "2" => 2);

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

serde_if_integer128! {
utf16!(i128_: i128 = "-2" => -2);
utf16!(u128_: u128 = "2" => 2);
}
utf16!(i128_: i128 = "-2" => -2);
utf16!(u128_: u128 = "2" => 2);

utf16!(f32_: f32 = "1.23" => 1.23);
utf16!(f64_: f64 = "1.23" => 1.23);
Expand Down
1 change: 0 additions & 1 deletion src/de/text.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use crate::{
};
use serde::de::value::BorrowedStrDeserializer;
use serde::de::{DeserializeSeed, Deserializer, EnumAccess, VariantAccess, Visitor};
use serde::serde_if_integer128;
use std::borrow::Cow;

/// A deserializer for a single text node of a mixed sequence of tags and text.
Expand Down
43 changes: 14 additions & 29 deletions src/se/content.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::se::{Indent, QuoteLevel, SeError, WriteResult, XmlName};
use serde::ser::{
Impossible, Serialize, SerializeSeq, SerializeTuple, SerializeTupleStruct, Serializer,
};
use serde::serde_if_integer128;
use std::fmt::Write;

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

serde_if_integer128! {
write_primitive!(serialize_i128(i128));
write_primitive!(serialize_u128(u128));
}
write_primitive!(serialize_i128(i128));
write_primitive!(serialize_u128(u128));

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

serde_if_integer128! {
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);
}
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);

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

serde_if_integer128! {
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
}
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");

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

serde_if_integer128! {
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
}
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");

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

serde_if_integer128! {
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);
}
serialize_as!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000", Text);
serialize_as!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000", Text);

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

serde_if_integer128! {
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
}
text!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
text!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");

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

serde_if_integer128! {
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");
}
value!(i128_: -420000000000000000000000000000i128 => "-420000000000000000000000000000");
value!(u128_: 420000000000000000000000000000u128 => "420000000000000000000000000000");

value!(f32_: 4.2f32 => "4.2");
value!(f64_: 4.2f64 => "4.2");
Expand Down
Loading