Skip to content
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

allow untagged enums to contain externally tagged enums #2353

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow untagged enums to contain externally tagged enums #2353

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
17 changes: 12 additions & 5 deletions serde/src/private/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,16 @@ mod content {
// This issue is tracking making some of this stuff public:
// https://github.com/serde-rs/serde/issues/741

#[cfg(feature = "alloc")]
use alloc::vec;

use lib::*;

use __private::size_hint;
use actually_private;
use de::{
self, Deserialize, DeserializeSeed, Deserializer, EnumAccess, Expected, IgnoredAny,
MapAccess, SeqAccess, Unexpected, Visitor,
MapAccess, SeqAccess, Unexpected, VariantAccess, Visitor
};

/// Used from generated code to buffer the contents of the Deserializer when
Expand Down Expand Up @@ -492,13 +495,17 @@ mod content {
Ok(Content::Map(vec))
}

fn visit_enum<V>(self, _visitor: V) -> Result<Self::Value, V::Error>
fn visit_enum<V>(self, visitor: V) -> Result<Self::Value, V::Error>
where
V: EnumAccess<'de>,
{
Err(de::Error::custom(
"untagged and internally tagged enums do not support enum input",
))
// While untagged and internally tagged enums do not support enum input,
// untagged enums can contain externally tagged enums
let (key, value) = visitor.variant()?;
let value = value
.newtype_variant()
.unwrap_or(Content::Unit);
Ok(Content::Map(vec![(key, value)]))
}
}

Expand Down