Fixed some clippy warnings in components (#32107)

* Fixed some clippy warnings in components

* Updated handling of NaN values in comparison

* Updated formatting using ./mach fmt

9 files changed, 20 insertions, 29 deletions

diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs
index 4b62672e07e..a8f4234d598 100644
--- a/components/script/dom/htmlelement.rs
+++ b/components/script/dom/htmlelement.rs
@@ -1043,7 +1043,7 @@ impl FormControl for HTMLElement {
             .set_form_owner(form);
     }
 
-    fn to_element<'a>(&'a self) -> &'a Element {
+    fn to_element(&self) -> &Element {
         debug_assert!(self.is_form_associated_custom_element());
         self.as_element()
     }
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index 3e21bc891c3..30b199f7941 100755
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -98,10 +98,7 @@ impl LayoutHTMLTextAreaElementHelpers for LayoutDom<'_, HTMLTextAreaElement> {
         if text.is_empty() {
             // FIXME(nox): Would be cool to not allocate a new string if the
             // placeholder is single line, but that's an unimportant detail.
-            self.placeholder()
-                .replace("\r\n", "\n")
-                .replace('\r', "\n")
-                .into()
+            self.placeholder().replace("\r\n", "\n").replace('\r', "\n")
         } else {
             text.into()
         }
diff --git a/components/script/dom/mediafragmentparser.rs b/components/script/dom/mediafragmentparser.rs
index a41951c1a4f..e8fb9b2c18a 100644
--- a/components/script/dom/mediafragmentparser.rs
+++ b/components/script/dom/mediafragmentparser.rs
@@ -128,14 +128,11 @@ impl MediaFragmentParser {
     fn parse_utc_timestamp(&self, input: &str) -> Result<(Option<f64>, Option<f64>), ()> {
         if input.ends_with('-') || input.starts_with(',') || !input.contains('-') {
             let sec = parse_hms(
-                NaiveDateTime::parse_from_str(
-                    &input.replace('-', "").replace(',', ""),
-                    "%Y%m%dT%H%M%S%.fZ",
-                )
-                .map_err(|_| ())?
-                .time()
-                .to_string()
-                .as_ref(),
+                NaiveDateTime::parse_from_str(&input.replace(['-', ','], ""), "%Y%m%dT%H%M%S%.fZ")
+                    .map_err(|_| ())?
+                    .time()
+                    .to_string()
+                    .as_ref(),
             )?;
             if input.starts_with(',') {
                 Ok((Some(0.), Some(sec)))
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 3bf396609ca..e24dc81adea 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -719,15 +719,11 @@ impl Node {
         other: &Node,
         shadow_including: ShadowIncluding,
     ) -> Option<DomRoot<Node>> {
-        for ancestor in self.inclusive_ancestors(shadow_including) {
-            if other
+        self.inclusive_ancestors(shadow_including).find(|ancestor| {
+            other
                 .inclusive_ancestors(shadow_including)
-                .any(|node| node == ancestor)
-            {
-                return Some(ancestor);
-            }
-        }
-        None
+                .any(|node| node == *ancestor)
+        })
     }
 
     pub fn is_inclusive_ancestor_of(&self, parent: &Node) -> bool {
diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs
index d54cb9a8b57..78e89640f7f 100644
--- a/components/script/dom/nodelist.rs
+++ b/components/script/dom/nodelist.rs
@@ -438,6 +438,6 @@ impl ElementsByNameList {
     pub fn item(&self, index: u32) -> Option<DomRoot<Node>> {
         self.document
             .nth_element_by_name(index, &self.name)
-            .and_then(|n| Some(DomRoot::from_ref(&*n)))
+            .map(|n| DomRoot::from_ref(&*n))
     }
 }
diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs
index 72b399b860c..254504e3b44 100644
--- a/components/script/dom/rtcpeerconnection.rs
+++ b/components/script/dom/rtcpeerconnection.rs
@@ -557,9 +557,9 @@ impl RTCPeerConnectionMethods for RTCPeerConnection {
     fn AddIceCandidate(&self, candidate: &RTCIceCandidateInit, comp: InRealm) -> Rc<Promise> {
         let p = Promise::new_in_current_realm(comp);
         if candidate.sdpMid.is_none() && candidate.sdpMLineIndex.is_none() {
-            p.reject_error(Error::Type(format!(
-                "one of sdpMid and sdpMLineIndex must be set"
-            )));
+            p.reject_error(Error::Type(
+                "one of sdpMid and sdpMLineIndex must be set".to_string(),
+            ));
             return p;
         }
 
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs
index 66d2026b8f3..43767c4a42a 100644
--- a/components/script/dom/webgl2renderingcontext.rs
+++ b/components/script/dom/webgl2renderingcontext.rs
@@ -2953,7 +2953,8 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
         }
 
         if pbo_offset < 0 || pbo_offset as usize > pixel_unpack_buffer.capacity() {
-            return Ok(self.base.webgl_error(InvalidValue));
+            self.base.webgl_error(InvalidValue);
+            return Ok(());
         }
 
         let unpacking_alignment = self.base.texture_unpacking_alignment();
@@ -4119,7 +4120,7 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
         handle_potential_webgl_error!(
             self.base,
             program.get_uniform_block_index(block_name),
-            return constants::INVALID_INDEX
+            constants::INVALID_INDEX
         )
     }
 
diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs
index ec7e4c76026..cf92577fa68 100644
--- a/components/script/dom/webgl_extensions/extensions.rs
+++ b/components/script/dom/webgl_extensions/extensions.rs
@@ -406,7 +406,7 @@ impl WebGLExtensions {
             .borrow()
             .tex_compression_formats
             .keys()
-            .map(|&k| k)
+            .copied()
             .collect()
     }
 
diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgltexture.rs
index 911943d4b84..7f26e822233 100644
--- a/components/script/dom/webgltexture.rs
+++ b/components/script/dom/webgltexture.rs
@@ -326,7 +326,7 @@ impl WebGLTexture {
             },
             EXTTextureFilterAnisotropicConstants::TEXTURE_MAX_ANISOTROPY_EXT => {
                 // NaN is not less than 1., what a time to be alive.
-                if !(float_value >= 1.) {
+                if float_value < 1. || !float_value.is_normal() {
                     return Err(WebGLError::InvalidValue);
                 }
                 self.upcast::<WebGLObject>()