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

Jump to bottom

Resolve FIXME now that we support Rust 1.19 #2379

Closed
wants to merge 2 commits into from
Closed

Resolve FIXME now that we support Rust 1.19 #2379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e3a568
Resolve FIXME now that we support Rust 1.19
RSilicon Feb 21, 2023
f4d04e2
Update de.rs
RSilicon Feb 21, 2023
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
20 changes: 4 additions & 16 deletions serde_derive/src/de.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1256,12 +1256,8 @@ fn deserialize_externally_tagged_enum(
// This is an empty enum like `enum Impossible {}` or an enum in which
// all variants have `#[serde(skip_deserializing)]`.
quote! {
// FIXME: Once we drop support for Rust 1.15:
// let _serde::__private::Err(__err) = _serde::de::EnumAccess::variant::<__Field>(__data);
// _serde::__private::Err(__err)
_serde::__private::Result::map(
_serde::de::EnumAccess::variant::<__Field>(__data),
|(__impossible, _)| match __impossible {})
let _serde::__private::Err(__err) = _serde::de::EnumAccess::variant::<__Field>(__data);
_serde::__private::Err(__err);
}
} else {
quote! {
Expand Down Expand Up @@ -2535,11 +2531,7 @@ fn deserialize_map(
let all_skipped = fields.iter().all(|field| field.attrs.skip_deserializing());
let match_keys = if cattrs.deny_unknown_fields() && all_skipped {
quote! {
// FIXME: Once we drop support for Rust 1.15:
// let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
_serde::__private::Option::map(
try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)),
|__impossible| match __impossible {});
let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
}
} else {
quote! {
Expand Down Expand Up @@ -2768,11 +2760,7 @@ fn deserialize_map_in_place(

let match_keys = if cattrs.deny_unknown_fields() && all_skipped {
quote! {
// FIXME: Once we drop support for Rust 1.15:
// let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
_serde::__private::Option::map(
try!(_serde::de::MapAccess::next_key::<__Field>(&mut __map)),
|__impossible| match __impossible {});
let _serde::__private::None::<__Field> = try!(_serde::de::MapAccess::next_key(&mut __map));
}
} else {
quote! {
Expand Down