clippy: Fix manual_map warnings (#31922)

7 files changed, 30 insertions, 47 deletions

diff --git a/components/script/dom/abstractworkerglobalscope.rs b/components/script/dom/abstractworkerglobalscope.rs
index 434d9a96160..835438c5f23 100644
--- a/components/script/dom/abstractworkerglobalscope.rs
+++ b/components/script/dom/abstractworkerglobalscope.rs
@@ -109,10 +109,9 @@ pub fn run_worker_event_loop<T, WorkerMsg, Event>(
         + DomObject,
 {
     let scope = worker_scope.upcast::<WorkerGlobalScope>();
-    let devtools_port = match scope.from_devtools_sender() {
-        Some(_) => Some(scope.from_devtools_receiver()),
-        None => None,
-    };
+    let devtools_port = scope
+        .from_devtools_sender()
+        .map(|_| scope.from_devtools_receiver());
     let task_queue = worker_scope.task_queue();
     let event = select! {
         recv(worker_scope.control_receiver()) -> msg => worker_scope.from_control_msg(msg.unwrap()),
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 2cac691be0f..f6d9fb16bae 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -3204,11 +3204,9 @@ impl<'a> SelectorsElement for DomRoot<Element> {
     }
 
     fn containing_shadow_host(&self) -> Option<Self> {
-        if let Some(shadow_root) = self.upcast::<Node>().containing_shadow_root() {
-            Some(shadow_root.Host())
-        } else {
-            None
-        }
+        self.upcast::<Node>()
+            .containing_shadow_root()
+            .map(|shadow_root| shadow_root.Host())
     }
 
     fn is_pseudo_element(&self) -> bool {
diff --git a/components/script/dom/fakexrdevice.rs b/components/script/dom/fakexrdevice.rs
index 305531f6048..21b533a5120 100644
--- a/components/script/dom/fakexrdevice.rs
+++ b/components/script/dom/fakexrdevice.rs
@@ -84,16 +84,14 @@ pub fn view<Eye>(view: &FakeXRViewInit) -> Fallible<MockViewInit<Eye>> {
     };
     let viewport = Rect::new(origin, size);
 
-    let fov = if let Some(ref fov) = view.fieldOfView {
-        Some((
+    let fov = view.fieldOfView.as_ref().map(|fov| {
+        (
             fov.leftDegrees.to_radians(),
             fov.rightDegrees.to_radians(),
             fov.upDegrees.to_radians(),
             fov.downDegrees.to_radians(),
-        ))
-    } else {
-        None
-    };
+        )
+    });
 
     Ok(MockViewInit {
         projection,
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 64506db9757..e59ac28a526 100755
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -1184,10 +1184,7 @@ impl HTMLInputElementMethods for HTMLInputElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-input-files
     fn GetFiles(&self) -> Option<DomRoot<FileList>> {
-        match self.filelist.get() {
-            Some(ref fl) => Some(fl.clone()),
-            None => None,
-        }
+        self.filelist.get().as_ref().map(|fl| fl.clone())
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-input-defaultchecked
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index ddc798915d1..f0617ef06d1 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -1941,10 +1941,12 @@ impl HTMLMediaElement {
     }
 
     pub fn get_current_frame(&self) -> Option<VideoFrame> {
-        match self.video_renderer.lock().unwrap().current_frame_holder {
-            Some(ref holder) => Some(holder.get_frame()),
-            None => None,
-        }
+        self.video_renderer
+            .lock()
+            .unwrap()
+            .current_frame_holder
+            .as_ref()
+            .map(|holder| holder.get_frame())
     }
 
     /// By default the audio is rendered through the audio sink automatically
@@ -2088,15 +2090,14 @@ impl HTMLMediaElementMethods for HTMLMediaElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-media-srcobject
     fn GetSrcObject(&self) -> Option<MediaStreamOrBlob> {
-        match *self.src_object.borrow() {
-            Some(ref src_object) => Some(match src_object {
+        (*self.src_object.borrow())
+            .as_ref()
+            .map(|src_object| match src_object {
                 SrcObject::Blob(blob) => MediaStreamOrBlob::Blob(DomRoot::from_ref(blob)),
                 SrcObject::MediaStream(stream) => {
                     MediaStreamOrBlob::MediaStream(DomRoot::from_ref(stream))
                 },
-            }),
-            None => None,
-        }
+            })
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-media-srcobject
@@ -2659,10 +2660,10 @@ impl FetchResponseListener for HTMLMediaElementFetchListener {
                 let content_length =
                     if let Some(content_range) = headers.typed_get::<ContentRange>() {
                         content_range.bytes_len()
-                    } else if let Some(content_length) = headers.typed_get::<ContentLength>() {
-                        Some(content_length.0)
                     } else {
-                        None
+                        headers
+                            .typed_get::<ContentLength>()
+                            .map(|content_length| content_length.0)
                     };
 
                 // We only set the expected input size if it changes.
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs
index 8739510a82b..1da57905dae 100644
--- a/components/script/dom/mediadevices.rs
+++ b/components/script/dom/mediadevices.rs
@@ -130,11 +130,8 @@ fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> {
                     max: range.parent.max,
                     ideal: range.ideal,
                 }))
-            } else if let Some(exact) = range.exact {
-                Some(Constrain::Value(exact))
             } else {
-                // the unspecified case is treated as all three being none
-                None
+                range.exact.map(Constrain::Value)
             }
         },
     }
@@ -150,11 +147,8 @@ fn convert_cdouble(js: &ConstrainDouble) -> Option<Constrain<f64>> {
                     max: range.parent.max.map(|x| *x),
                     ideal: range.ideal.map(|x| *x),
                 }))
-            } else if let Some(exact) = range.exact {
-                Some(Constrain::Value(*exact))
             } else {
-                // the unspecified case is treated as all three being none
-                None
+                range.exact.map(|exact| Constrain::Value(*exact))
             }
         },
     }
diff --git a/components/script/dom/xrinputsource.rs b/components/script/dom/xrinputsource.rs
index 02a4747f3aa..ad0cea99a08 100644
--- a/components/script/dom/xrinputsource.rs
+++ b/components/script/dom/xrinputsource.rs
@@ -122,13 +122,9 @@ impl XRInputSourceMethods for XRInputSource {
 
     // https://github.com/immersive-web/webxr-hands-input/blob/master/explainer.md
     fn GetHand(&self) -> Option<DomRoot<XRHand>> {
-        if let Some(ref hand) = self.info.hand_support {
-            Some(
-                self.hand
-                    .or_init(|| XRHand::new(&self.global(), self, hand.clone())),
-            )
-        } else {
-            None
-        }
+        self.info.hand_support.as_ref().map(|hand| {
+            self.hand
+                .or_init(|| XRHand::new(&self.global(), self, hand.clone()))
+        })
     }
 }