aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'components/script')
-rw-r--r--components/script/devtools.rs4
-rw-r--r--components/script/dom/document.rs4
-rw-r--r--components/script/dom/htmlformelement.rs2
-rw-r--r--components/script/dom/htmlinputelement.rs5
-rw-r--r--components/script/dom/node.rs5
-rw-r--r--components/script/dom/performance.rs4
-rw-r--r--components/script/dom/webglprogram.rs2
-rw-r--r--components/script/dom/webglrenderingcontext.rs2
-rw-r--r--components/script/dom/websocket.rs4
-rw-r--r--components/script/dom/writablestreamdefaultwriter.rs2
-rw-r--r--components/script/stylesheet_loader.rs4
-rw-r--r--components/script/textinput.rs2
-rw-r--r--components/script/xpath/parser.rs2
13 files changed, 18 insertions, 24 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index 66e22fc7b4e..d657e6ffd06 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -144,9 +144,7 @@ pub(crate) fn handle_get_children(
Some(parent) => {
let is_whitespace = |node: &NodeInfo| {
node.node_type == NodeConstants::TEXT_NODE &&
- node.node_value
- .as_ref()
- .map_or(true, |v| v.trim().is_empty())
+ node.node_value.as_ref().is_none_or(|v| v.trim().is_empty())
};
let inline: Vec<_> = parent
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 5f8388066fc..e9b96fc1061 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -1114,7 +1114,7 @@ impl Document {
if implicit_transaction {
self.begin_focus_transaction();
}
- if elem.map_or(true, |e| e.is_focusable_area()) {
+ if elem.is_none_or(|e| e.is_focusable_area()) {
*self.focus_transaction.borrow_mut() =
FocusTransaction::InTransaction(elem.map(Dom::from_ref));
}
@@ -1795,7 +1795,7 @@ impl Document {
let target_has_changed = prev_mouse_over_target
.get()
.as_ref()
- .map_or(true, |old_target| old_target != &new_target);
+ .is_none_or(|old_target| old_target != &new_target);
// Here we know the target has changed, so we must update the state,
// dispatch mouseout to the previous one, mouseover to the new one.
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs
index a19eb97d843..3a7a56ffaf4 100644
--- a/components/script/dom/htmlformelement.rs
+++ b/components/script/dom/htmlformelement.rs
@@ -1639,7 +1639,7 @@ pub(crate) trait FormControl: DomObject {
let has_form_attr = elem.has_attribute(&local_name!("form"));
let same_subtree = self
.form_owner()
- .map_or(true, |form| elem.is_in_same_home_subtree(&*form));
+ .is_none_or(|form| elem.is_in_same_home_subtree(&*form));
self.unregister_if_necessary();
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 7ea5586bc7b..eedd9134966 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -837,10 +837,7 @@ impl HTMLInputElement {
},
// https://html.spec.whatwg.org/multipage/#file-upload-state-(type%3Dfile)%3Asuffering-from-being-missing
InputType::File => {
- self.Required() &&
- self.filelist
- .get()
- .map_or(true, |files| files.Length() == 0)
+ self.Required() && self.filelist.get().is_none_or(|files| files.Length() == 0)
},
// https://html.spec.whatwg.org/multipage/#the-required-attribute%3Asuffering-from-being-missing
_ => {
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index eef14ef6fa2..8055425976a 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -1317,7 +1317,7 @@ impl Node {
}
pub(crate) fn is_display_none(&self) -> bool {
- self.style_data.borrow().as_ref().map_or(true, |data| {
+ self.style_data.borrow().as_ref().is_none_or(|data| {
data.element_data
.borrow()
.styles
@@ -2184,8 +2184,7 @@ impl Node {
) {
node.owner_doc().add_script_and_layout_blocker();
debug_assert!(*node.owner_doc() == *parent.owner_doc());
- debug_assert!(child.map_or(true, |child| Some(parent) ==
- child.GetParentNode().as_deref()));
+ debug_assert!(child.is_none_or(|child| Some(parent) == child.GetParentNode().as_deref()));
// Step 1.
let count = if node.is::<DocumentFragment>() {
diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs
index c19adceaca1..cd537642bb3 100644
--- a/components/script/dom/performance.rs
+++ b/components/script/dom/performance.rs
@@ -78,10 +78,10 @@ impl PerformanceEntryList {
.entries
.iter()
.filter(|e| {
- name.as_ref().map_or(true, |name_| *e.name() == *name_) &&
+ name.as_ref().is_none_or(|name_| *e.name() == *name_) &&
entry_type
.as_ref()
- .map_or(true, |type_| *e.entry_type() == *type_)
+ .is_none_or(|type_| *e.entry_type() == *type_)
})
.cloned()
.collect::<Vec<DomRoot<PerformanceEntry>>>();
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs
index 562b7620038..5b101430c6a 100644
--- a/components/script/dom/webglprogram.rs
+++ b/components/script/dom/webglprogram.rs
@@ -432,7 +432,7 @@ impl WebGLProgram {
let (size, type_) = {
let (base_name, array_index) = match parse_uniform_name(&name) {
- Some((name, index)) if index.map_or(true, |i| i >= 0) => (name, index),
+ Some((name, index)) if index.is_none_or(|i| i >= 0) => (name, index),
_ => return Ok(None),
};
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 337ba8415e0..ecccecffb3b 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -670,7 +670,7 @@ impl WebGLRenderingContext {
// or UNSIGNED_SHORT_5_5_5_1, a Uint16Array must be supplied.
// or FLOAT, a Float32Array must be supplied.
// If the types do not match, an INVALID_OPERATION error is generated.
- let data_type_matches = data.as_ref().map_or(true, |buffer| {
+ let data_type_matches = data.as_ref().is_none_or(|buffer| {
Some(data_type.sized_data_type()) ==
array_buffer_type_to_sized_type(buffer.get_array_type()) &&
data_type.required_webgl_version() <= self.webgl_version()
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index f00b3ef6aea..363ccb2f761 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -349,7 +349,7 @@ impl WebSocketMethods<crate::DomTypeHolder> for WebSocket {
// https://html.spec.whatwg.org/multipage/#dom-websocket-send
fn Send(&self, data: USVString) -> ErrorResult {
- let data_byte_len = data.0.as_bytes().len() as u64;
+ let data_byte_len = data.0.len() as u64;
let send_data = self.send_impl(data_byte_len)?;
if send_data {
@@ -417,7 +417,7 @@ impl WebSocketMethods<crate::DomTypeHolder> for WebSocket {
}
}
if let Some(ref reason) = reason {
- if reason.0.as_bytes().len() > 123 {
+ if reason.0.len() > 123 {
//reason cannot be larger than 123 bytes
return Err(Error::Syntax);
}
diff --git a/components/script/dom/writablestreamdefaultwriter.rs b/components/script/dom/writablestreamdefaultwriter.rs
index ab26a752804..2c6358e96ac 100644
--- a/components/script/dom/writablestreamdefaultwriter.rs
+++ b/components/script/dom/writablestreamdefaultwriter.rs
@@ -286,7 +286,7 @@ impl WritableStreamDefaultWriter {
if !self
.stream
.get()
- .map_or(false, |current_stream| current_stream == stream)
+ .is_some_and(|current_stream| current_stream == stream)
{
let promise = Promise::new(global, can_gc);
promise.reject_error(Error::Type(
diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs
index 80a3f878160..94e6aa299e6 100644
--- a/components/script/stylesheet_loader.rs
+++ b/components/script/stylesheet_loader.rs
@@ -188,7 +188,7 @@ impl FetchResponseListener for StylesheetContext {
// else we risk applying the wrong stylesheet when responses come out-of-order.
let is_stylesheet_load_applicable = self
.request_generation_id
- .map_or(true, |gen| gen == link.get_request_generation_id());
+ .is_none_or(|gen| gen == link.get_request_generation_id());
if is_stylesheet_load_applicable {
let shared_lock = document.style_shared_lock().clone();
let sheet = Arc::new(Stylesheet::from_bytes(
@@ -375,7 +375,7 @@ impl StyleStylesheetLoader for StylesheetLoader<'_> {
layer: ImportLayer,
) -> Arc<Locked<ImportRule>> {
// Ensure the supports conditions for this @import are true, if not, refuse to load
- if !supports.as_ref().map_or(true, |s| s.enabled) {
+ if !supports.as_ref().is_none_or(|s| s.enabled) {
return Arc::new(lock.wrap(ImportRule {
url,
stylesheet: ImportSheet::new_refused(),
diff --git a/components/script/textinput.rs b/components/script/textinput.rs
index 1a72c0d26f8..64f4d75d8ef 100644
--- a/components/script/textinput.rs
+++ b/components/script/textinput.rs
@@ -1001,7 +1001,7 @@ impl<T: ClipboardProvider> TextInput<T> {
/// Whether the content is empty.
pub(crate) fn is_empty(&self) -> bool {
- self.lines.len() <= 1 && self.lines.first().map_or(true, |line| line.is_empty())
+ self.lines.len() <= 1 && self.lines.first().is_none_or(|line| line.is_empty())
}
/// The length of the content in bytes.
diff --git a/components/script/xpath/parser.rs b/components/script/xpath/parser.rs
index cec3148bc70..b1a4bfcc42d 100644
--- a/components/script/xpath/parser.rs
+++ b/components/script/xpath/parser.rs
@@ -352,7 +352,7 @@ impl CoreFunction {
let min = self.min_args();
let max = self.max_args();
- num_args >= min && max.map_or(true, |max| num_args <= max)
+ num_args >= min && max.is_none_or(|max| num_args <= max)
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-27 08:41:38 +0000