Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

clippy: Fix collapsible_if warnings (#31852)

Browse source
This commit is contained in:
Oluwatobi Sofela 2024-03-25 14:55:45 +01:00 • committed by GitHub
parent 3d10dbae32
commit a53632c0e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 85 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/script/dom/bluetoothdevice.rs
View file

@ -231,11 +231,8 @@ impl BluetoothDevice {
let context = self.get_context(); let context = self.get_context();
for (id, device) in context.get_device_map().borrow().iter() { for (id, device) in context.get_device_map().borrow().iter() {
// Step 2.1 - 2.2. // 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(());
return Ok(());
}
// TODO: Step 2.3: Implement activeAlgorithms internal slot for BluetoothRemoteGATTServer.
} }
} }

6
components/script/dom/document.rs
View file

@ -2393,10 +2393,8 @@ impl Document {
// TODO: should this only happen on the first document loaded? // TODO: should this only happen on the first document loaded?
// https://immersive-web.github.io/webxr/#user-intention // https://immersive-web.github.io/webxr/#user-intention
// https://github.com/immersive-web/navigation/issues/10 // 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();
self.window.Navigator().Xr().dispatch_sessionavailable();
}
} }
// Step 12: completely loaded. // Step 12: completely loaded.

37
components/script/dom/htmlformelement.rs
View file

@ -143,18 +143,16 @@ impl HTMLFormElement {
RadioListMode::ControlsExceptImageInputs => { RadioListMode::ControlsExceptImageInputs => {
if child if child
.downcast::<HTMLElement>() .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) ||
child.get_name().map_or(false, |n| n == *name))
{ {
if child.get_id().map_or(false, |i| i == *name) || if let Some(inp) = child.downcast::<HTMLInputElement>() {
child.get_name().map_or(false, |n| n == *name) // input, only return it if it's not image-button state
{ return inp.input_type() != InputType::Image;
if let Some(inp) = child.downcast::<HTMLInputElement>() { } else {
// input, only return it if it's not image-button state // control, but not an input
return inp.input_type() != InputType::Image; return true;
} else {
// control, but not an input
return true;
}
} }
} }
return false; return false;
@ -719,11 +717,9 @@ impl HTMLFormElement {
// Step 6.2 // Step 6.2
self.firing_submission_events.set(true); self.firing_submission_events.set(true);
// Step 6.3 // 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);
self.firing_submission_events.set(false); return;
return;
}
} }
// Step 6.4 // Step 6.4
// spec calls this "submitterButton" but it doesn't have to be a button, // spec calls this "submitterButton" but it doesn't have to be a button,
@ -1537,10 +1533,11 @@ pub trait FormControl: DomObject {
.next(); .next();
// Step 1 // 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) &&
return; nearest_form_ancestor == old_owner
} {
return;
} }
let new_owner = if self.is_listed() && has_form_id && elem.is_connected() { let new_owner = if self.is_listed() && has_form_id && elem.is_connected() {

32
components/script/dom/htmlinputelement.rs
View file

@ -2684,28 +2684,28 @@ impl Validatable for HTMLInputElement {
let mut failed_flags = ValidationFlags::empty(); let mut failed_flags = ValidationFlags::empty();
let value = self.Value(); 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); {
} 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); {
} 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); {
} 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); {
} failed_flags.insert(ValidationFlags::BAD_INPUT);
} }
if validate_flags.intersects(ValidationFlags::TOO_LONG | ValidationFlags::TOO_SHORT) { if validate_flags.intersects(ValidationFlags::TOO_LONG | ValidationFlags::TOO_SHORT) {

10
components/script/dom/htmltextareaelement.rs
View file

@ -736,10 +736,12 @@ impl Validatable for HTMLTextAreaElement {
// https://html.spec.whatwg.org/multipage/#suffering-from-being-missing // https://html.spec.whatwg.org/multipage/#suffering-from-being-missing
// https://html.spec.whatwg.org/multipage/#the-textarea-element%3Asuffering-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() &&
failed_flags.insert(ValidationFlags::VALUE_MISSING); self.is_mutable() &&
} value_len == 0
{
failed_flags.insert(ValidationFlags::VALUE_MISSING);
} }
if value_dirty && last_edit_by_user && value_len > 0 { if value_dirty && last_edit_by_user && value_len > 0 {

10
components/script/dom/navigationpreloadmanager.rs
View file

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

12
components/script/dom/request.rs
View file

@ -238,12 +238,12 @@ impl Request {
} }
// Step 21 // 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(), return Err(Error::Type(
)); "Cache is 'only-if-cached' and mode is not 'same-origin'".to_string(),
} ));
} }
// Step 22 // Step 22

8
components/script/dom/webgl_extensions/extensions.rs
View file

@ -458,10 +458,10 @@ impl WebGLExtensions {
} }
pub fn effective_type(&self, type_: u32) -> u32 { 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; {
} return gl::HALF_FLOAT;
} }
type_ type_
} }

8
components/script/dom/webglrenderingcontext.rs
View file

@ -871,10 +871,10 @@ impl WebGLRenderingContext {
} }
// See https://www.khronos.org/registry/webgl/specs/latest/2.0/#4.1.6 // 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); {
} return self.webgl_error(InvalidOperation);
} }
let settings = self.texture_unpacking_settings.get(); let settings = self.texture_unpacking_settings.get();

6
components/script/dom/window.rs
View file

@ -2257,10 +2257,8 @@ impl Window {
// Step 4 and 5 // Step 4 and 5
let window_proxy = self.window_proxy(); let window_proxy = self.window_proxy();
if let Some(active) = window_proxy.currently_active() { 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;
return;
}
} }
} }

44
components/script/dom/xmlhttprequest.rs
View file

@ -753,29 +753,29 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
if let Some(encoding) = encoding { if let Some(encoding) = encoding {
let mime: Mime = ct.into(); let mime: Mime = ct.into();
for param in mime.params() { 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() let new_params: Vec<(Name, Name)> = mime
.filter(|p| p.0 != mime::CHARSET) .params()
.map(|p| (p.0, p.1)) .filter(|p| p.0 != mime::CHARSET)
.collect(); .map(|p| (p.0, p.1))
.collect();
let new_mime = format!( let new_mime = format!(
"{}/{}; charset={}{}{}", "{}/{}; charset={}{}{}",
mime.type_().as_ref(), mime.type_().as_ref(),
mime.subtype().as_ref(), mime.subtype().as_ref(),
encoding, encoding,
if new_params.is_empty() { "" } else { "; " }, if new_params.is_empty() { "" } else { "; " },
new_params new_params
.iter() .iter()
.map(|p| format!("{}={}", p.0, p.1)) .map(|p| format!("{}={}", p.0, p.1))
.collect::<Vec<String>>() .collect::<Vec<String>>()
.join("; ") .join("; ")
); );
let new_mime: Mime = new_mime.parse().unwrap(); let new_mime: Mime = new_mime.parse().unwrap();
request.headers.typed_insert(ContentType::from(new_mime)) request.headers.typed_insert(ContentType::from(new_mime))
}
} }
} }
} }