Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

clippy: Fix collapsible_else_if warnings (#31853)

Browse source
This commit is contained in:
Oluwatobi Sofela 2024-03-26 10:15:04 +01:00 • committed by GitHub
parent d814d05539
commit f8a2eaea47
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 37 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/eventtarget.rs
View file

@ -579,16 +579,14 @@ impl EventTarget {
Some(CommonEventHandler::ErrorEventHandler(unsafe {
OnErrorEventHandlerNonNull::new(cx, funobj)
}))
} else if ty == &atom!("beforeunload") {
Some(CommonEventHandler::BeforeUnloadEventHandler(unsafe {
OnBeforeUnloadEventHandlerNonNull::new(cx, funobj)
}))
} else {
if ty == &atom!("beforeunload") {
Some(CommonEventHandler::BeforeUnloadEventHandler(unsafe {
OnBeforeUnloadEventHandlerNonNull::new(cx, funobj)
}))
} else {
Some(CommonEventHandler::EventHandler(unsafe {
EventHandlerNonNull::new(cx, funobj)
}))
}
Some(CommonEventHandler::EventHandler(unsafe {
EventHandlerNonNull::new(cx, funobj)
}))
}
}

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

@ -210,10 +210,8 @@ impl GPUDevice {
}
}
self.try_remove_scope(s_id);
} else {
if let Err((err, _)) = result {
self.fire_uncaptured_error(err);
}
} else if let Err((err, _)) = result {
self.fire_uncaptured_error(err);
}
}

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

@ -578,17 +578,16 @@ impl HTMLFormElementMethods for HTMLFormElement {
} else {
a.source.cmp(&b.source)
}
} else if a
.element
.upcast::<Node>()
.CompareDocumentPosition(b.element.upcast::<Node>()) &
NodeConstants::DOCUMENT_POSITION_FOLLOWING ==
NodeConstants::DOCUMENT_POSITION_FOLLOWING
{
std::cmp::Ordering::Less
} else {
if a.element
.upcast::<Node>()
.CompareDocumentPosition(b.element.upcast::<Node>()) &
NodeConstants::DOCUMENT_POSITION_FOLLOWING ==
NodeConstants::DOCUMENT_POSITION_FOLLOWING
{
std::cmp::Ordering::Less
} else {
std::cmp::Ordering::Greater
}
std::cmp::Ordering::Greater
}
});

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

@ -2868,11 +2868,9 @@ fn filter_from_accept(s: &DOMString) -> Vec<FilterPattern> {
for p in split_commas(s) {
if let Some('.') = p.chars().nth(0) {
filter.push(FilterPattern(p[1..].to_string()));
} else {
if let Some(exts) = mime_guess::get_mime_extensions_str(p) {
for ext in exts {
filter.push(FilterPattern(ext.to_string()));
}
} else if let Some(exts) = mime_guess::get_mime_extensions_str(p) {
for ext in exts {
filter.push(FilterPattern(ext.to_string()));
}
}
}

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

@ -167,11 +167,9 @@ impl HTMLSelectElement {
if let Some(last_selected) = last_selected {
last_selected.set_selectedness(true);
} else {
if self.display_size() == 1 {
if let Some(first_enabled) = first_enabled {
first_enabled.set_selectedness(true);
}
} else if self.display_size() == 1 {
if let Some(first_enabled) = first_enabled {
first_enabled.set_selectedness(true);
}
}
}

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

@ -92,12 +92,10 @@ impl StylePropertyMapReadOnlyMethods for StylePropertyMapReadOnly {
} else {
Ordering::Greater
}
} else if let Ok(_) = custom_properties::parse_name(key2) {
Ordering::Less
} else {
if let Ok(_) = custom_properties::parse_name(key2) {
Ordering::Less
} else {
key1.cmp(key2)
}
key1.cmp(key2)
}
});
result

8
components/script/layout_dom/node.rs
View file

@ -82,12 +82,10 @@ impl<'dom, LayoutDataType: LayoutDataTrait> fmt::Debug for ServoLayoutNode<'dom,
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if let Some(el) = self.as_element() {
el.fmt(f)
} else if self.is_text_node() {
write!(f, "<text node> ({:#x})", self.opaque().0)
} else {
if self.is_text_node() {
write!(f, "<text node> ({:#x})", self.opaque().0)
} else {
write!(f, "<non-text node> ({:#x})", self.opaque().0)
}
write!(f, "<non-text node> ({:#x})", self.opaque().0)
}
}
}

16
components/script/textinput.rs
View file

@ -627,15 +627,13 @@ impl<T: ClipboardProvider> TextInput<T> {
if self.selection_origin.is_none() {
self.selection_origin = Some(self.edit_point);
}
} else {
if self.has_selection() {
self.edit_point = match adjust {
Direction::Backward => self.selection_start(),
Direction::Forward => self.selection_end(),
};
self.clear_selection();
return true;
}
} else if self.has_selection() {
self.edit_point = match adjust {
Direction::Backward => self.selection_start(),
Direction::Forward => self.selection_end(),
};
self.clear_selection();
return true;
}
false
}