clippy: Fix collapsible_if warnings (#31852)

components/script/dom/bluetoothdevice.rs

@@ -231,12 +231,9 @@ impl BluetoothDevice {
         let context = self.get_context();
         for (id, device) in context.get_device_map().borrow().iter() {
             // Step 2.1 - 2.2.
-            if id == &self.Id().to_string() {
+            if id == &self.Id().to_string() && device.get_gatt().Connected() {
-                if device.get_gatt().Connected() {
                 return Ok(());
             }
-                // TODO: Step 2.3: Implement activeAlgorithms internal slot for BluetoothRemoteGATTServer.
-            }
         }
 
         // Step 3.

components/script/dom/document.rs

@@ -2393,11 +2393,9 @@ impl Document {
         // TODO: should this only happen on the first document loaded?
         // https://immersive-web.github.io/webxr/#user-intention
         // https://github.com/immersive-web/navigation/issues/10
-        if pref!(dom.webxr.sessionavailable) {
+        if pref!(dom.webxr.sessionavailable) && self.window.is_top_level() {
-            if self.window.is_top_level() {
             self.window.Navigator().Xr().dispatch_sessionavailable();
         }
-        }
 
         // Step 12: completely loaded.
         // https://html.spec.whatwg.org/multipage/#completely-loaded

components/script/dom/htmlformelement.rs

@@ -143,10 +143,9 @@ impl HTMLFormElement {
                 RadioListMode::ControlsExceptImageInputs => {
                     if child
                         .downcast::<HTMLElement>()
-                        .map_or(false, |c| c.is_listed_element())
+                        .map_or(false, |c| c.is_listed_element()) &&
-                    {
+                        (child.get_id().map_or(false, |i| i == *name) ||
-                        if child.get_id().map_or(false, |i| i == *name) ||
+                            child.get_name().map_or(false, |n| n == *name))
-                            child.get_name().map_or(false, |n| n == *name)
                     {
                         if let Some(inp) = child.downcast::<HTMLInputElement>() {
                             // input, only return it if it's not image-button state
@@ -156,7 +155,6 @@ impl HTMLFormElement {
                             return true;
                         }
                     }
-                    }
                     return false;
                 },
                 RadioListMode::Images => {
@@ -719,12 +717,10 @@ impl HTMLFormElement {
             // Step 6.2
             self.firing_submission_events.set(true);
             // Step 6.3
-            if !submitter.no_validate(self) {
+            if !submitter.no_validate(self) && self.interactive_validation().is_err() {
-                if self.interactive_validation().is_err() {
                 self.firing_submission_events.set(false);
                 return;
             }
-            }
             // Step 6.4
             // spec calls this "submitterButton" but it doesn't have to be a button,
             // just not be the form itself
@@ -1537,11 +1533,12 @@ pub trait FormControl: DomObject {
             .next();
 
         // Step 1
-        if old_owner.is_some() && !(self.is_listed() && has_form_id) {
+        if old_owner.is_some() &&
-            if nearest_form_ancestor == old_owner {
+            !(self.is_listed() && has_form_id) &&
+            nearest_form_ancestor == old_owner
+        {
             return;
         }
-        }
 
         let new_owner = if self.is_listed() && has_form_id && elem.is_connected() {
             // Step 3

components/script/dom/htmlinputelement.rs

@@ -2684,29 +2684,29 @@ impl Validatable for HTMLInputElement {
         let mut failed_flags = ValidationFlags::empty();
         let value = self.Value();
 
-        if validate_flags.contains(ValidationFlags::VALUE_MISSING) {
+        if validate_flags.contains(ValidationFlags::VALUE_MISSING) &&
-            if self.suffers_from_being_missing(&value) {
+            self.suffers_from_being_missing(&value)
+        {
             failed_flags.insert(ValidationFlags::VALUE_MISSING);
         }
-        }
 
-        if validate_flags.contains(ValidationFlags::TYPE_MISMATCH) {
+        if validate_flags.contains(ValidationFlags::TYPE_MISMATCH) &&
-            if self.suffers_from_type_mismatch(&value) {
+            self.suffers_from_type_mismatch(&value)
+        {
             failed_flags.insert(ValidationFlags::TYPE_MISMATCH);
         }
-        }
 
-        if validate_flags.contains(ValidationFlags::PATTERN_MISMATCH) {
+        if validate_flags.contains(ValidationFlags::PATTERN_MISMATCH) &&
-            if self.suffers_from_pattern_mismatch(&value) {
+            self.suffers_from_pattern_mismatch(&value)
+        {
             failed_flags.insert(ValidationFlags::PATTERN_MISMATCH);
         }
-        }
 
-        if validate_flags.contains(ValidationFlags::BAD_INPUT) {
+        if validate_flags.contains(ValidationFlags::BAD_INPUT) &&
-            if self.suffers_from_bad_input(&value) {
+            self.suffers_from_bad_input(&value)
+        {
             failed_flags.insert(ValidationFlags::BAD_INPUT);
         }
-        }
 
         if validate_flags.intersects(ValidationFlags::TOO_LONG | ValidationFlags::TOO_SHORT) {
             failed_flags |= self.suffers_from_length_issues(&value);

components/script/dom/htmltextareaelement.rs

@@ -736,11 +736,13 @@ impl Validatable for HTMLTextAreaElement {
 
         // https://html.spec.whatwg.org/multipage/#suffering-from-being-missing
         // https://html.spec.whatwg.org/multipage/#the-textarea-element%3Asuffering-from-being-missing
-        if validate_flags.contains(ValidationFlags::VALUE_MISSING) {
+        if validate_flags.contains(ValidationFlags::VALUE_MISSING) &&
-            if self.Required() && self.is_mutable() && value_len == 0 {
+            self.Required() &&
+            self.is_mutable() &&
+            value_len == 0
+        {
             failed_flags.insert(ValidationFlags::VALUE_MISSING);
         }
-        }
 
         if value_dirty && last_edit_by_user && value_len > 0 {
             // https://html.spec.whatwg.org/multipage/#suffering-from-being-too-long

components/script/dom/navigationpreloadmanager.rs

@@ -117,14 +117,12 @@ impl NavigationPreloadManagerMethods for NavigationPreloadManager {
         let mut state = NavigationPreloadState::empty();
 
         // 3.
-        if self.serviceworker_registration.is_active() {
+        if self.serviceworker_registration.is_active() &&
-            if self
+            self.serviceworker_registration
-                .serviceworker_registration
                 .get_navigation_preload_enabled()
         {
             state.enabled = true;
         }
-        }
 
         // 4.
         state.headerValue = self

components/script/dom/request.rs

@@ -238,13 +238,13 @@ impl Request {
         }
 
         // Step 21
-        if request.cache_mode == NetTraitsRequestCache::OnlyIfCached {
+        if request.cache_mode == NetTraitsRequestCache::OnlyIfCached &&
-            if request.mode != NetTraitsRequestMode::SameOrigin {
+            request.mode != NetTraitsRequestMode::SameOrigin
+        {
             return Err(Error::Type(
                 "Cache is 'only-if-cached' and mode is not 'same-origin'".to_string(),
             ));
         }
-        }
 
         // Step 22
         if let Some(init_redirect) = init.redirect.as_ref() {

components/script/dom/webgl_extensions/extensions.rs

@@ -458,11 +458,11 @@ impl WebGLExtensions {
     }
 
     pub fn effective_type(&self, type_: u32) -> u32 {
-        if type_ == OESTextureHalfFloatConstants::HALF_FLOAT_OES {
+        if type_ == OESTextureHalfFloatConstants::HALF_FLOAT_OES &&
-            if !self.supports_gl_extension("GL_OES_texture_half_float") {
+            !self.supports_gl_extension("GL_OES_texture_half_float")
+        {
             return gl::HALF_FLOAT;
         }
-        }
         type_
     }
 

components/script/dom/webglrenderingcontext.rs

@@ -871,11 +871,11 @@ impl WebGLRenderingContext {
         }
 
         // See https://www.khronos.org/registry/webgl/specs/latest/2.0/#4.1.6
-        if self.webgl_version() == WebGLVersion::WebGL1 {
+        if self.webgl_version() == WebGLVersion::WebGL1 &&
-            if data_type != image_info.data_type().unwrap() {
+            data_type != image_info.data_type().unwrap()
+        {
             return self.webgl_error(InvalidOperation);
         }
-        }
 
         let settings = self.texture_unpacking_settings.get();
         let dest_premultiplied = settings.contains(TextureUnpacking::PREMULTIPLY_ALPHA);

components/script/dom/window.rs

@@ -2257,12 +2257,10 @@ impl Window {
         // Step 4 and 5
         let window_proxy = self.window_proxy();
         if let Some(active) = window_proxy.currently_active() {
-            if pipeline_id == active {
+            if pipeline_id == active && doc.is_prompting_or_unloading() {
-                if doc.is_prompting_or_unloading() {
                 return;
             }
         }
-        }
 
         // Step 8
         if doc.prompt_to_unload(false) {

components/script/dom/xmlhttprequest.rs

@@ -753,8 +753,9 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
                         if let Some(encoding) = encoding {
                             let mime: Mime = ct.into();
                             for param in mime.params() {
-                                if param.0 == mime::CHARSET {
+                                if param.0 == mime::CHARSET &&
-                                    if !param.1.as_ref().eq_ignore_ascii_case(encoding) {
+                                    !param.1.as_ref().eq_ignore_ascii_case(encoding)
+                                {
                                     let new_params: Vec<(Name, Name)> = mime
                                         .params()
                                         .filter(|p| p.0 != mime::CHARSET)
@@ -780,7 +781,6 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
                         }
                     }
                 }
-                }
             },
             _ => (),
         }