mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Replace .map_or(false with Option::is_some_and (#33468)
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
parent
236cae9ce5
commit
7df30f3788
51 changed files with 165 additions and 171 deletions
|
@ -975,7 +975,7 @@ impl HTMLImageElement {
|
|||
let is_parent_picture = elem
|
||||
.upcast::<Node>()
|
||||
.GetParentElement()
|
||||
.map_or(false, |p| p.is::<HTMLPictureElement>());
|
||||
.is_some_and(|p| p.is::<HTMLPictureElement>());
|
||||
if src_set.is_empty() && !is_parent_picture && !src.is_empty() {
|
||||
selected_source = Some(src.clone());
|
||||
pixel_density = Some(1_f64);
|
||||
|
@ -1295,7 +1295,7 @@ impl HTMLImageElement {
|
|||
let is_parent_picture = elem
|
||||
.upcast::<Node>()
|
||||
.GetParentElement()
|
||||
.map_or(false, |p| p.is::<HTMLPictureElement>());
|
||||
.is_some_and(|p| p.is::<HTMLPictureElement>());
|
||||
has_src || is_parent_picture
|
||||
}
|
||||
|
||||
|
@ -1405,7 +1405,7 @@ impl HTMLImageElement {
|
|||
.find(|n| {
|
||||
n.upcast::<Element>()
|
||||
.get_name()
|
||||
.map_or(false, |n| *n == *last)
|
||||
.is_some_and(|n| *n == *last)
|
||||
});
|
||||
|
||||
useMapElements.map(|mapElem| mapElem.get_area_elements())
|
||||
|
@ -1420,9 +1420,7 @@ impl HTMLImageElement {
|
|||
.borrow()
|
||||
.final_url
|
||||
.as_ref()
|
||||
.map_or(false, |url| {
|
||||
url.scheme() == "data" || url.origin().same_origin(origin)
|
||||
})
|
||||
.is_some_and(|url| url.scheme() == "data" || url.origin().same_origin(origin))
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue