clippy: Fix unneeded return statement warnings (#31776)

15 files changed, 28 insertions, 33 deletions

diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 041f060a735..ae42a3d3305 100755
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -524,7 +524,7 @@ impl HTMLInputElement {
                 return Some(min);
             }
         }
-        return self.default_minimum();
+        self.default_minimum()
     }
 
     // https://html.spec.whatwg.org/multipage#concept-input-max
@@ -538,7 +538,7 @@ impl HTMLInputElement {
                 return Some(max);
             }
         }
-        return self.default_maximum();
+        self.default_maximum()
     }
 
     // when allowed_value_step and minumum both exist, this is the smallest
@@ -2789,7 +2789,7 @@ impl Activatable for HTMLInputElement {
             },
             _ => (),
         }
-        return None;
+        None
     }
 
     // https://dom.spec.whatwg.org/#eventtarget-legacy-canceled-activation-behavior
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
index c9341f2ccaf..ace17083c25 100644
--- a/components/script/dom/htmlmediaelement.rs
+++ b/components/script/dom/htmlmediaelement.rs
@@ -1930,7 +1930,7 @@ 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 => return None,
+            None => None,
         }
     }
 
diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs
index 01a3df05e6d..5e140c1aadc 100644
--- a/components/script/dom/htmloutputelement.rs
+++ b/components/script/dom/htmloutputelement.rs
@@ -111,7 +111,7 @@ impl HTMLOutputElementMethods for HTMLOutputElement {
 
     // https://html.spec.whatwg.org/multipage/#dom-output-type
     fn Type(&self) -> DOMString {
-        return DOMString::from("output");
+        DOMString::from("output")
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-fe-name
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index 53d68fd55cc..7faca549566 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -1122,7 +1122,6 @@ impl HTMLScriptElement {
                 if let Err(exception) = evaluated {
                     module_tree.set_rethrow_error(exception);
                     module_tree.report_error(global);
-                    return;
                 }
             }
         }
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index 4d94b30cb98..a0b230e62bb 100755
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -190,7 +190,7 @@ impl HTMLTextAreaElement {
 
     pub fn auto_directionality(&self) -> String {
         let value: String = self.Value().to_string();
-        return HTMLInputElement::directionality_from_value(&value);
+        HTMLInputElement::directionality_from_value(&value)
     }
 
     fn update_placeholder_shown_state(&self) {
diff --git a/components/script/dom/mediametadata.rs b/components/script/dom/mediametadata.rs
index 2706b80a0fe..f23aac0d4e6 100644
--- a/components/script/dom/mediametadata.rs
+++ b/components/script/dom/mediametadata.rs
@@ -59,9 +59,7 @@ impl MediaMetadata {
     }
 
     fn queue_update_metadata_algorithm(&self) {
-        if self.session.get().is_none() {
-            return;
-        }
+        if self.session.get().is_none() {}
     }
 
     pub fn set_session(&self, session: &MediaSession) {
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index b3ca725ce8b..03377c571ca 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -3016,15 +3016,15 @@ impl NodeMethods for Node {
         match (node1, node2) {
             (None, _) => {
                 // node1 is null
-                return NodeConstants::DOCUMENT_POSITION_FOLLOWING +
+                NodeConstants::DOCUMENT_POSITION_FOLLOWING +
                     NodeConstants::DOCUMENT_POSITION_DISCONNECTED +
-                    NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
+                    NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC
             },
             (_, None) => {
                 // node2 is null
-                return NodeConstants::DOCUMENT_POSITION_PRECEDING +
+                NodeConstants::DOCUMENT_POSITION_PRECEDING +
                     NodeConstants::DOCUMENT_POSITION_DISCONNECTED +
-                    NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
+                    NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC
             },
             (Some(node1), Some(node2)) => {
                 // still step 6, testing if node1 and 2 share a root
@@ -3080,13 +3080,13 @@ impl NodeMethods for Node {
                 // contained in the other.
                 //
                 // If we're the container, return that `other` is contained by us.
-                return if self_and_ancestors.len() < other_and_ancestors.len() {
+                if self_and_ancestors.len() < other_and_ancestors.len() {
                     NodeConstants::DOCUMENT_POSITION_FOLLOWING +
                         NodeConstants::DOCUMENT_POSITION_CONTAINED_BY
                 } else {
                     NodeConstants::DOCUMENT_POSITION_PRECEDING +
                         NodeConstants::DOCUMENT_POSITION_CONTAINS
-                };
+                }
             },
         }
     }
diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs
index 9a364b3391f..afb504c07f7 100644
--- a/components/script/dom/offscreencanvas.rs
+++ b/components/script/dom/offscreencanvas.rs
@@ -171,7 +171,7 @@ impl OffscreenCanvasMethods for OffscreenCanvas {
 
     // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-width
     fn Width(&self) -> u64 {
-        return self.width.get();
+        self.width.get()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-width
@@ -189,7 +189,7 @@ impl OffscreenCanvasMethods for OffscreenCanvas {
 
     // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-height
     fn Height(&self) -> u64 {
-        return self.height.get();
+        self.height.get()
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas-height
diff --git a/components/script/dom/oscillatornode.rs b/components/script/dom/oscillatornode.rs
index c067dc42011..292a27f3422 100644
--- a/components/script/dom/oscillatornode.rs
+++ b/components/script/dom/oscillatornode.rs
@@ -143,7 +143,7 @@ impl OscillatorNodeMethods for OscillatorNode {
             .message(AudioNodeMessage::OscillatorNode(
                 OscillatorNodeMessage::SetOscillatorType(type_.into()),
             ));
-        return Ok(());
+        Ok(())
     }
 }
 
diff --git a/components/script/dom/performanceobserver.rs b/components/script/dom/performanceobserver.rs
index c87fedcd843..3e11d228672 100644
--- a/components/script/dom/performanceobserver.rs
+++ b/components/script/dom/performanceobserver.rs
@@ -244,6 +244,6 @@ impl PerformanceObserverMethods for PerformanceObserver {
             .map(|entry| DomRoot::from_ref(&**entry))
             .collect();
         entries.clear();
-        return taken;
+        taken
     }
 }
diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs
index d359a1aec1f..6de907086ec 100644
--- a/components/script/dom/response.rs
+++ b/components/script/dom/response.rs
@@ -299,7 +299,7 @@ impl ResponseMethods for Response {
         match *self.status.borrow() {
             Some(s) => {
                 let status_num = s.as_u16();
-                return status_num >= 200 && status_num <= 299;
+                status_num >= 200 && status_num <= 299
             },
             None => false,
         }
diff --git a/components/script/dom/selection.rs b/components/script/dom/selection.rs
index ade8b3eff9f..2d5b3cb0474 100644
--- a/components/script/dom/selection.rs
+++ b/components/script/dom/selection.rs
@@ -359,7 +359,7 @@ impl SelectionMethods for Selection {
             // Step 2
             return Err(Error::InvalidState);
         }
-        return Ok(());
+        Ok(())
     }
 
     // https://w3c.github.io/selection-api/#dom-selection-setbaseandextent
@@ -447,7 +447,7 @@ impl SelectionMethods for Selection {
             // selectionchange event as it would if if mutated any other way
             return range.DeleteContents();
         }
-        return Ok(());
+        Ok(())
     }
 
     // https://w3c.github.io/selection-api/#dom-selection-containsnode
@@ -478,7 +478,7 @@ impl SelectionMethods for Selection {
                 if node == end_node {
                     return range.EndOffset() > 0;
                 }
-                return true;
+                true
             } else {
                 if node.is_before(start_node) {
                     return false;
@@ -493,11 +493,11 @@ impl SelectionMethods for Selection {
                 if node == end_node {
                     return range.EndOffset() == node.len();
                 }
-                return true;
+                true
             }
         } else {
             // No range
-            return false;
+            false
         }
     }
 
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs
index 3c0d357151d..5faa4b2dfc4 100644
--- a/components/script/dom/webgl2renderingcontext.rs
+++ b/components/script/dom/webgl2renderingcontext.rs
@@ -892,8 +892,7 @@ impl WebGL2RenderingContext {
 
         handle_potential_webgl_error!(
             self.base,
-            texture.storage(target, levels, internal_format, width, height, depth),
-            return
+            texture.storage(target, levels, internal_format, width, height, depth)
         );
     }
 }
@@ -4197,8 +4196,7 @@ impl WebGL2RenderingContextMethods for WebGL2RenderingContext {
 
         handle_potential_webgl_error!(
             self.base,
-            program.bind_uniform_block(block_index, block_binding),
-            return
+            program.bind_uniform_block(block_index, block_binding)
         )
     }
 
diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgltexture.rs
index cd5539ab55e..0a89f519b0f 100644
--- a/components/script/dom/webgltexture.rs
+++ b/components/script/dom/webgltexture.rs
@@ -312,7 +312,7 @@ impl WebGLTexture {
             },
             constants::TEXTURE_MAG_FILTER => match int_value as u32 {
                 constants::NEAREST | constants::LINEAR => update_filter(&self.mag_filter),
-                _ => return Err(WebGLError::InvalidEnum),
+                _ => Err(WebGLError::InvalidEnum),
             },
             constants::TEXTURE_WRAP_S | constants::TEXTURE_WRAP_T => match int_value as u32 {
                 constants::CLAMP_TO_EDGE | constants::MIRRORED_REPEAT | constants::REPEAT => {
diff --git a/components/script/dom/windowproxy.rs b/components/script/dom/windowproxy.rs
index a2f2940a934..50330a1da16 100644
--- a/components/script/dom/windowproxy.rs
+++ b/components/script/dom/windowproxy.rs
@@ -537,7 +537,7 @@ impl WindowProxy {
             return Ok(None);
         }
         // Step 17.
-        return Ok(target_document.browsing_context());
+        Ok(target_document.browsing_context())
     }
 
     // https://html.spec.whatwg.org/multipage/#the-rules-for-choosing-a-browsing-context-given-a-browsing-context-name
@@ -840,7 +840,7 @@ fn parse_open_feature_boolean(tokenized_features: &IndexMap<String, String>, nam
         }
     }
     // Step 5
-    return false;
+    false
 }
 
 // This is only called from extern functions,