Don’t use Option::zip to keep MSRV

Option::zip was introduced in 1.46.0 but our MSRV is 1.40.0.
This commit is contained in:
Robin Krahl 2021-06-18 17:32:31 +02:00
parent 68f20c8d8c
commit f336104a60
No known key found for this signature in database
GPG Key ID: 8E9B0870524F69D8

View File

@ -444,9 +444,8 @@ fn get_method_groups(
while let Some(subheading) = &next {
if subheading.is_element(&local_name!("h3")) && subheading.has_class("impl") {
let title = subheading.first_child();
let impl_items = subheading.next_sibling();
if let Some((title, impl_items)) = title.zip(impl_items) {
if let Some(title) = subheading.first_child() {
if let Some(impl_items) = subheading.next_sibling() {
if let Some(group) =
get_impl_items(parent, &title, &impl_items, ty, &subheading_type)?
{
@ -454,15 +453,15 @@ fn get_method_groups(
}
next = impl_items.next_sibling();
}
}
} else if subheading.is_element(&local_name!("details")) {
let summary = subheading.first_child();
let h3 = summary
.as_ref()
.and_then(|n| n.first_child())
.filter(|n| n.is_element(&local_name!("h3")) && n.has_class("impl"));
let title = h3.and_then(|n| n.first_child());
let impl_items = summary.and_then(|n| n.next_sibling());
if let Some((title, impl_items)) = title.zip(impl_items) {
if let Some(title) = h3.and_then(|n| n.first_child()) {
if let Some(impl_items) = summary.and_then(|n| n.next_sibling()) {
if let Some(group) =
get_impl_items(parent, &title, &impl_items, ty, &subheading_type)?
{
@ -470,6 +469,7 @@ fn get_method_groups(
}
next = subheading.next_sibling();
}
}
} else {
next = None;
}