Skip to content

Remove some ? from generated code #2936

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

Merged
dtolnay merged 1 commit into from
Sep 28, 2025
Merged

Remove some ? from generated code #2936

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions serde_derive/src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,13 +594,16 @@ fn deserialize_seq_in_place(
let (wrapper, wrapper_ty) = wrap_deserialize_field_with(params, field.ty, path);
quote!({
#wrapper
match _serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq)? {
_serde::#private::Some(__wrap) => {
match _serde::de::SeqAccess::next_element::<#wrapper_ty>(&mut __seq) {
_serde::#private::Ok(_serde::#private::Some(__wrap)) => {
self.place.#member = __wrap.value;
}
_serde::#private::None => {
_serde::#private::Ok(_serde::#private::None) => {
#value_if_none;
}
_serde::#private::Err(__err) => {
return _serde::#private::Err(__err);
}
}
})
}
Expand Down
14 changes: 8 additions & 6 deletions serde_derive/src/de/enum_adjacently.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,8 @@ pub(super) fn deserialize(
__A: _serde::de::SeqAccess<#delife>,
{
// Visit the first element - the tag.
match _serde::de::SeqAccess::next_element(&mut __seq)? {
_serde::#private::Some(__variant) => {
match _serde::de::SeqAccess::next_element(&mut __seq) {
_serde::#private::Ok(_serde::#private::Some(__variant)) => {
// Visit the second element - the content.
match _serde::de::SeqAccess::next_element_seed(
&mut __seq,
Expand All @@ -292,18 +292,20 @@ pub(super) fn deserialize(
marker: _serde::#private::PhantomData,
lifetime: _serde::#private::PhantomData,
},
)? {
_serde::#private::Some(__ret) => _serde::#private::Ok(__ret),
) {
_serde::#private::Ok(_serde::#private::Some(__ret)) => _serde::#private::Ok(__ret),
// There is no second element.
_serde::#private::None => {
_serde::#private::Ok(_serde::#private::None) => {
_serde::#private::Err(_serde::de::Error::invalid_length(1, &self))
}
_serde::#private::Err(__err) => _serde::#private::Err(__err),
}
}
// There is no first element.
_serde::#private::None => {
_serde::#private::Ok(_serde::#private::None) => {
_serde::#private::Err(_serde::de::Error::invalid_length(0, &self))
}
_serde::#private::Err(__err) => _serde::#private::Err(__err),
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions serde_derive/src/de/enum_externally.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub(super) fn deserialize(
));

quote! {
(__Field::#variant_name, __variant) => #block
_serde::#private::Ok((__Field::#variant_name, __variant)) => #block
}
});

Expand All @@ -69,8 +69,9 @@ pub(super) fn deserialize(
}
} else {
quote! {
match _serde::de::EnumAccess::variant(__data)? {
match _serde::de::EnumAccess::variant(__data) {
#(#variant_arms)*
_serde::#private::Err(__err) => _serde::#private::Err(__err),
}
}
};
Expand Down
Loading