Skip to content

Clean up naming in from_slice return value in example #96

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.

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

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions src/de/enum_.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -25,7 +25,7 @@ impl<'a, 'de, 's> de::EnumAccess<'de> for UnitVariantAccess<'a, 'de, 's> {
}
}

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<()> {
Expand Down Expand Up @@ -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;

Expand All @@ -78,7 +78,7 @@ impl<'a, 'de, 's> de::EnumAccess<'de> for VariantAccess<'a, 'de, 's> {
}
}

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<()> {
Expand Down
4 changes: 2 additions & 2 deletions src/de/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<K>(&mut self, seed: K) -> Result<Option<K::Value>, Error>
Expand Down Expand Up @@ -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<V>(self, _visitor: V) -> Result<V::Value, Error>
Expand Down
4 changes: 2 additions & 2 deletions src/de/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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<V>(self, visitor: V) -> Result<V::Value>
Expand Down
2 changes: 1 addition & 1 deletion src/de/seq.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<T>(&mut self, seed: T) -> Result<Option<T::Value>>
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Data<'_>>(message).unwrap();
//! let (data, _consumed) = serde_json_core::from_slice::<Data<'_>>(message).unwrap();
//! assert_eq!(data.value, 10);
//! assert_eq!(data.message, "Hello, World!");
//!
Expand Down
2 changes: 1 addition & 1 deletion src/ser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down