diff --git a/Cargo.lock b/Cargo.lock index 20ca83a39..5bda287bf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -591,18 +591,28 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -611,14 +621,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.142" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a2455c7aa..e7eb98cac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ pyo3 = { version = "0.26", features = ["generate-import-lib", "num-bigint", "py- regex = "1.11.1" strum = { version = "0.27", features = ["derive"] } strum_macros = "0.27" -serde_json = { version = "1.0.142", features = ["arbitrary_precision"] } +serde_json = { version = "1.0.145", features = ["arbitrary_precision"] } enum_dispatch = "0.3.13" serde = { version = "1.0.219", features = ["derive"] } speedate = "0.17.0" diff --git a/src/serializers/ser.rs b/src/serializers/ser.rs index f28918e58..383be9cd6 100644 --- a/src/serializers/ser.rs +++ b/src/serializers/ser.rs @@ -1,6 +1,6 @@ use std::{io, num::FpCategory}; -use serde::{ser::Impossible, serde_if_integer128, Serialize, Serializer}; +use serde::{ser::Impossible, Serialize, Serializer}; use serde_json::ser::{CompactFormatter, Formatter, PrettyFormatter, State}; use super::errors::PythonSerializerError; @@ -908,25 +908,23 @@ where Ok(()) } - serde_if_integer128! { - fn serialize_i128(self, value: i128) -> Result<()> { - tri!(self - .ser - .formatter - .begin_string(&mut self.ser.writer) - .map_err(|e| PythonSerializerError { message: e.to_string() })); - tri!(self - .ser - .formatter - .write_number_str(&mut self.ser.writer, &value.to_string()) - .map_err(|e| PythonSerializerError { message: e.to_string() })); - tri!(self - .ser - .formatter - .end_string(&mut self.ser.writer) - .map_err(|e| PythonSerializerError { message: e.to_string() })); - Ok(()) - } + fn serialize_i128(self, value: i128) -> Result<()> { + tri!(self + .ser + .formatter + .begin_string(&mut self.ser.writer) + .map_err(|e| PythonSerializerError { message: e.to_string() })); + tri!(self + .ser + .formatter + .write_number_str(&mut self.ser.writer, &value.to_string()) + .map_err(|e| PythonSerializerError { message: e.to_string() })); + tri!(self + .ser + .formatter + .end_string(&mut self.ser.writer) + .map_err(|e| PythonSerializerError { message: e.to_string() })); + Ok(()) } fn serialize_u8(self, value: u8) -> Result<()> { @@ -1005,25 +1003,23 @@ where Ok(()) } - serde_if_integer128! { - fn serialize_u128(self, value: u128) -> Result<()> { - tri!(self - .ser - .formatter - .begin_string(&mut self.ser.writer) - .map_err(|e| PythonSerializerError { message: e.to_string() })); - tri!(self - .ser - .formatter - .write_number_str(&mut self.ser.writer, &value.to_string()) - .map_err(|e| PythonSerializerError { message: e.to_string() })); - tri!(self - .ser - .formatter - .end_string(&mut self.ser.writer) - .map_err(|e| PythonSerializerError { message: e.to_string() })); - Ok(()) - } + fn serialize_u128(self, value: u128) -> Result<()> { + tri!(self + .ser + .formatter + .begin_string(&mut self.ser.writer) + .map_err(|e| PythonSerializerError { message: e.to_string() })); + tri!(self + .ser + .formatter + .write_number_str(&mut self.ser.writer, &value.to_string()) + .map_err(|e| PythonSerializerError { message: e.to_string() })); + tri!(self + .ser + .formatter + .end_string(&mut self.ser.writer) + .map_err(|e| PythonSerializerError { message: e.to_string() })); + Ok(()) } fn serialize_f32(self, _value: f32) -> Result<()> { @@ -1156,10 +1152,8 @@ impl serde::ser::Serializer for NumberStrEmitter<'_, Err(invalid_number()) } - serde_if_integer128! { - fn serialize_i128(self, _v: i128) -> Result<()> { - Err(invalid_number()) - } + fn serialize_i128(self, _v: i128) -> Result<()> { + Err(invalid_number()) } fn serialize_u8(self, _v: u8) -> Result<()> { @@ -1178,10 +1172,8 @@ impl serde::ser::Serializer for NumberStrEmitter<'_, Err(invalid_number()) } - serde_if_integer128! { - fn serialize_u128(self, _v: u128) -> Result<()> { - Err(invalid_number()) - } + fn serialize_u128(self, _v: u128) -> Result<()> { + Err(invalid_number()) } fn serialize_f32(self, _v: f32) -> Result<()> {