From 0728378424e3a28a260207ff43a9c2b3af58df56 Mon Sep 17 00:00:00 2001 From: Azhar Ismagulova <31756707+azharcodeit@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:17:47 +0000 Subject: [PATCH] clippy: remove unneeded return statements (#31923) --- components/script/body.rs | 2 +- components/script/dom/bindings/interface.rs | 4 ++-- components/script/dom/bindings/str.rs | 2 +- components/script/dom/bindings/structuredclone.rs | 4 ++-- components/script/dom/bluetooth.rs | 2 +- components/script/dom/element.rs | 2 +- components/script/dom/gamepad.rs | 10 +++------- components/script/dom/globalscope.rs | 2 +- components/servo/lib.rs | 2 +- ports/servoshell/minibrowser.rs | 4 ++-- 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/components/script/body.rs b/components/script/body.rs index c1cd40940e5..36c6d3cc8b4 100644 --- a/components/script/body.rs +++ b/components/script/body.rs @@ -338,7 +338,7 @@ impl Callback for TransmitBodyPromiseRejectionHandler { fn callback(&self, _cx: JSContext, _v: HandleValue, _realm: InRealm) { // Step 5.4, the "rejection" steps. let _ = self.control_sender.send(BodyChunkRequest::Error); - return self.stream.stop_reading(); + self.stream.stop_reading(); } } diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index b9d78988d6d..34f6a694dc4 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -602,7 +602,7 @@ fn get_proto_id_for_new_target(new_target: HandleObject) -> Option diff --git a/components/script/dom/bindings/structuredclone.rs b/components/script/dom/bindings/structuredclone.rs index d9c17d129ea..b37c9ab2093 100644 --- a/components/script/dom/bindings/structuredclone.rs +++ b/components/script/dom/bindings/structuredclone.rs @@ -107,7 +107,7 @@ unsafe fn write_blob( "Writing structured data for a blob failed in {:?}.", owner.get_url() ); - return false; + false } unsafe extern "C" fn read_callback( @@ -134,7 +134,7 @@ unsafe extern "C" fn read_callback( &mut *(closure as *mut StructuredDataHolder), ); } - return ptr::null_mut(); + ptr::null_mut() } unsafe extern "C" fn write_callback( diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 106323cf746..77ca187a671 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -330,7 +330,7 @@ where sender, )) .unwrap(); - return p; + p } // https://webbluetoothcg.github.io/web-bluetooth/#bluetoothlescanfilterinit-canonicalizing diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index f6d9fb16bae..f1eaae32f40 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -2878,7 +2878,7 @@ impl ElementMethods for Element { match self.as_maybe_activatable() { Some(a) => { a.exit_formal_activation_state(); - return Ok(()); + Ok(()) }, None => Err(Error::NotSupported), } diff --git a/components/script/dom/gamepad.rs b/components/script/dom/gamepad.rs index 8624f42c530..e057f83d76c 100644 --- a/components/script/dom/gamepad.rs +++ b/components/script/dom/gamepad.rs @@ -286,11 +286,7 @@ impl Gamepad { /// pub fn contains_user_gesture(update_type: GamepadUpdateType) -> bool { match update_type { - GamepadUpdateType::Axis(_, value) => { - return value.abs() > AXIS_TILT_THRESHOLD; - }, - GamepadUpdateType::Button(_, value) => { - return value > BUTTON_PRESS_THRESHOLD; - }, - }; + GamepadUpdateType::Axis(_, value) => value.abs() > AXIS_TILT_THRESHOLD, + GamepadUpdateType::Button(_, value) => value > BUTTON_PRESS_THRESHOLD, + } } diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs index 8ddcd133cf8..6668053fe67 100644 --- a/components/script/dom/globalscope.rs +++ b/components/script/dom/globalscope.rs @@ -1143,7 +1143,7 @@ impl GlobalScope { ); } } else { - return warn!("post_messageport_msg called on a global not managing any ports."); + warn!("post_messageport_msg called on a global not managing any ports."); } } diff --git a/components/servo/lib.rs b/components/servo/lib.rs index 038560338b0..22bfe09a58f 100644 --- a/components/servo/lib.rs +++ b/components/servo/lib.rs @@ -800,7 +800,7 @@ where } }, } - return false; + false } fn receive_messages(&mut self) { diff --git a/ports/servoshell/minibrowser.rs b/ports/servoshell/minibrowser.rs index 3f11f18e387..811ac893cc8 100644 --- a/ports/servoshell/minibrowser.rs +++ b/ports/servoshell/minibrowser.rs @@ -336,7 +336,7 @@ impl Minibrowser { ) -> bool { let need_update = browser.load_status() != self.load_status; self.load_status = browser.load_status(); - return need_update; + need_update } /// Updates all fields taken from the given [WebViewManager], such as the location field. @@ -349,6 +349,6 @@ impl Minibrowser { // because logical OR would short-circuit if any of the functions return true. // We want to ensure that all functions are called. The "bitwise OR" operator // does not short-circuit. - return self.update_location_in_toolbar(browser) | self.update_spinner_in_toolbar(browser); + self.update_location_in_toolbar(browser) | self.update_spinner_in_toolbar(browser) } }