itsscb/json
1
0
Fork 0
mirror of https://github.com/serde-rs/json.git synced 2025-10-02 07:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Touch up PR 1135

Browse Source
This commit is contained in:
David Tolnay 2024-10-18 10:42:15 -07:00
parent b4954a9561
commit 0d084c5038
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/map.rs
View File

@ -6,6 +6,7 @@
//! [`BTreeMap`]: https://doc.rust-lang.org/std/collections/struct.BTreeMap.html
//! [`IndexMap`]: https://docs.rs/indexmap/*/indexmap/map/struct.IndexMap.html
use crate::error::Error;
use crate::value::Value;
use alloc::string::String;
#[cfg(feature = "preserve_order")]
@ -589,7 +590,7 @@ macro_rules! delegate_iterator {
}
}
impl<'de> de::IntoDeserializer<'de, crate::Error> for Map<String, Value> {
impl<'de> de::IntoDeserializer<'de, Error> for Map<String, Value> {
type Deserializer = Self;
fn into_deserializer(self) -> Self::Deserializer {
@ -597,7 +598,7 @@ impl<'de> de::IntoDeserializer<'de, crate::Error> for Map<String, Value> {
}
}
impl<'de> de::IntoDeserializer<'de, crate::Error> for &'de Map<String, Value> {
impl<'de> de::IntoDeserializer<'de, Error> for &'de Map<String, Value> {
type Deserializer = Self;
fn into_deserializer(self) -> Self::Deserializer {

8
src/value/de.rs
View File

@ -11,8 +11,8 @@ use core::fmt;
use core::slice;
use core::str::FromStr;
use serde::de::{
self, Deserialize, DeserializeSeed, EnumAccess, Expected, IntoDeserializer, MapAccess,
SeqAccess, Unexpected, VariantAccess, Visitor,
self, Deserialize, DeserializeSeed, Deserializer as _, EnumAccess, Expected, IntoDeserializer,
MapAccess, SeqAccess, Unexpected, VariantAccess, Visitor,
};
use serde::forward_to_deserialize_any;
@ -597,8 +597,6 @@ impl<'de> VariantAccess<'de> for VariantDeserializer {
where
V: Visitor<'de>,
{
use serde::de::Deserializer;
match self.value {
Some(Value::Object(v)) => v.deserialize_any(visitor),
Some(other) => Err(serde::de::Error::invalid_type(
@ -1109,8 +1107,6 @@ impl<'de> VariantAccess<'de> for VariantRefDeserializer<'de> {
where
V: Visitor<'de>,
{
use serde::de::Deserializer;
match self.value {
Some(Value::Object(v)) => v.deserialize_any(visitor),
Some(other) => Err(serde::de::Error::invalid_type(