From df0f29d1ac9f18c329afec24809192a688661e75 Mon Sep 17 00:00:00 2001 From: Christian Meusel Date: Wed, 5 Feb 2025 18:01:37 +0100 Subject: [PATCH 1/3] Clean up naming in from_slice return value in example The second element of the returned tuple is the number of bytes consumed as stated in the docs of this function. --- src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib.rs b/src/lib.rs index 9a20a807..5e8b9220 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -16,7 +16,7 @@ //! //! // Serialized JSON data can be easily deserialized into Rust types. //! let message = b"{\"value\":10,\"message\":\"Hello, World!\"}"; -//! let (data, _remainder) = serde_json_core::from_slice::>(message).unwrap(); +//! let (data, _consumed) = serde_json_core::from_slice::>(message).unwrap(); //! assert_eq!(data.value, 10); //! assert_eq!(data.message, "Hello, World!"); //! From 147cac1064c7ed65c04b48297067f742acd5f504 Mon Sep 17 00:00:00 2001 From: Christian Meusel Date: Wed, 5 Feb 2025 21:06:17 +0100 Subject: [PATCH 2/3] Fix warnings from clippy with 'cargo clippy --fix' --- src/de/enum_.rs | 4 ++-- src/de/map.rs | 2 +- src/de/mod.rs | 4 ++-- src/de/seq.rs | 2 +- src/ser/mod.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/de/enum_.rs b/src/de/enum_.rs index 2c3c6eb6..63e9b5bd 100644 --- a/src/de/enum_.rs +++ b/src/de/enum_.rs @@ -12,7 +12,7 @@ impl<'a, 'b, 's> UnitVariantAccess<'a, 'b, 's> { } } -impl<'a, 'de, 's> de::EnumAccess<'de> for UnitVariantAccess<'a, 'de, 's> { +impl<'de> de::EnumAccess<'de> for UnitVariantAccess<'_, 'de, '_> { type Error = Error; type Variant = Self; @@ -64,7 +64,7 @@ impl<'a, 'b, 's> VariantAccess<'a, 'b, 's> { } } -impl<'a, 'de, 's> de::EnumAccess<'de> for VariantAccess<'a, 'de, 's> { +impl<'de> de::EnumAccess<'de> for VariantAccess<'_, 'de, '_> { type Error = Error; type Variant = Self; diff --git a/src/de/map.rs b/src/de/map.rs index c38c81d8..ea7a6ba9 100644 --- a/src/de/map.rs +++ b/src/de/map.rs @@ -13,7 +13,7 @@ impl<'a, 'b, 's> MapAccess<'a, 'b, 's> { } } -impl<'a, 'de, 's> de::MapAccess<'de> for MapAccess<'a, 'de, 's> { +impl<'de> de::MapAccess<'de> for MapAccess<'_, 'de, '_> { type Error = Error; fn next_key_seed(&mut self, seed: K) -> Result, Error> diff --git a/src/de/mod.rs b/src/de/mod.rs index 88e8fc2f..64d4eeda 100644 --- a/src/de/mod.rs +++ b/src/de/mod.rs @@ -381,7 +381,7 @@ macro_rules! deserialize_fromstr { }}; } -impl<'a, 'de, 's> de::Deserializer<'de> for &'a mut Deserializer<'de, 's> { +impl<'de> de::Deserializer<'de> for &mut Deserializer<'de, '_> { type Error = Error; /// Unsupported. Can’t parse a value without knowing its expected type. @@ -608,7 +608,7 @@ impl<'a, 'de, 's> de::Deserializer<'de> for &'a mut Deserializer<'de, 's> { struct EscapedStringDeserializer<'a, 'de, 's>(&'a mut Deserializer<'de, 's>); - impl<'a, 'de, 's> serde::Deserializer<'de> for EscapedStringDeserializer<'a, 'de, 's> { + impl<'de> serde::Deserializer<'de> for EscapedStringDeserializer<'_, 'de, '_> { type Error = Error; fn deserialize_any(self, visitor: V) -> Result diff --git a/src/de/seq.rs b/src/de/seq.rs index 1470a5af..ad2d92a6 100644 --- a/src/de/seq.rs +++ b/src/de/seq.rs @@ -13,7 +13,7 @@ impl<'a, 'b, 's> SeqAccess<'a, 'b, 's> { } } -impl<'a, 'de, 's> de::SeqAccess<'de> for SeqAccess<'a, 'de, 's> { +impl<'de> de::SeqAccess<'de> for SeqAccess<'_, 'de, '_> { type Error = Error; fn next_element_seed(&mut self, seed: T) -> Result> diff --git a/src/ser/mod.rs b/src/ser/mod.rs index 74db6e09..273072f2 100644 --- a/src/ser/mod.rs +++ b/src/ser/mod.rs @@ -651,7 +651,7 @@ impl<'a, 'b> StringCollector<'a, 'b> { } } -impl<'a, 'b> fmt::Write for StringCollector<'a, 'b> { +impl fmt::Write for StringCollector<'_, '_> { fn write_str(&mut self, s: &str) -> fmt::Result { self.do_write_str(s).or(Err(fmt::Error)) } From c6ca1f0f15ca2e5f7e71aeb1c54058cfa66ce25a Mon Sep 17 00:00:00 2001 From: Christian Meusel Date: Wed, 5 Feb 2025 21:10:39 +0100 Subject: [PATCH 3/3] Manually fix remaining issues from clippy --- src/de/enum_.rs | 4 ++-- src/de/map.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/de/enum_.rs b/src/de/enum_.rs index 63e9b5bd..b620491f 100644 --- a/src/de/enum_.rs +++ b/src/de/enum_.rs @@ -25,7 +25,7 @@ impl<'de> de::EnumAccess<'de> for UnitVariantAccess<'_, 'de, '_> { } } -impl<'de, 'a, 's> de::VariantAccess<'de> for UnitVariantAccess<'a, 'de, 's> { +impl<'de> de::VariantAccess<'de> for UnitVariantAccess<'_, 'de, '_> { type Error = Error; fn unit_variant(self) -> Result<()> { @@ -78,7 +78,7 @@ impl<'de> de::EnumAccess<'de> for VariantAccess<'_, 'de, '_> { } } -impl<'de, 'a, 's> de::VariantAccess<'de> for VariantAccess<'a, 'de, 's> { +impl<'de> de::VariantAccess<'de> for VariantAccess<'_, 'de, '_> { type Error = Error; fn unit_variant(self) -> Result<()> { diff --git a/src/de/map.rs b/src/de/map.rs index ea7a6ba9..bcf90322 100644 --- a/src/de/map.rs +++ b/src/de/map.rs @@ -61,7 +61,7 @@ struct MapKey<'a, 'b, 's> { de: &'a mut Deserializer<'b, 's>, } -impl<'de, 'a, 's> de::Deserializer<'de> for MapKey<'a, 'de, 's> { +impl<'de> de::Deserializer<'de> for MapKey<'_, 'de, '_> { type Error = Error; fn deserialize_any(self, _visitor: V) -> Result