aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAli <azy5030@gmail.com>2024-09-14 03:41:13 -0500
committerGitHub <noreply@github.com>2024-09-14 08:41:13 +0000
commited6b1b5e6a5002bdeab51214576b50b10822b5f8 (patch)
tree44984436dcd0656813fedbb2ab679a4bdbebe029
parent6a3cdc47ec61e9d5122dd68aba8c75c00c9e5051 (diff)
downloadservo-ed6b1b5e6a5002bdeab51214576b50b10822b5f8.tar.gz
servo-ed6b1b5e6a5002bdeab51214576b50b10822b5f8.zip
clippy: Fix suggestions in `script`, `libservo`, and `servoshell` (#33453)
* fix clone on copy warning in servoshell Signed-off-by: Ali Zein Yousuf <azy5030@gmail.com> * Remove unecessary borrow in libservo Signed-off-by: Ali Zein Yousuf <azy5030@gmail.com> * Ignore too many arguments warning on create_constellation() Signed-off-by: Ali Zein Yousuf <azy5030@gmail.com> * fix explicit auto-deref warning Signed-off-by: Ali Zein Yousuf <azy5030@gmail.com> * Autofix multiple clippy warnings in components/script Signed-off-by: Ali Zein Yousuf <azy5030@gmail.com> --------- Signed-off-by: Ali Zein Yousuf <azy5030@gmail.com>
-rw-r--r--components/script/devtools.rs5
-rw-r--r--components/script/dom/bindings/proxyhandler.rs2
-rw-r--r--components/script/dom/bindings/str.rs2
-rw-r--r--components/script/dom/document.rs2
-rw-r--r--components/script/dom/file.rs4
-rw-r--r--components/script/dom/gamepad.rs2
-rw-r--r--components/script/dom/gamepadhapticactuator.rs9
-rw-r--r--components/script/dom/gpubuffer.rs2
-rw-r--r--components/script/dom/gpuconvert.rs14
-rw-r--r--components/script/dom/gpudevice.rs4
-rw-r--r--components/script/dom/gpurenderbundleencoder.rs2
-rw-r--r--components/script/dom/htmlheadelement.rs2
-rw-r--r--components/script/dom/htmllinkelement.rs4
-rw-r--r--components/script/dom/node.rs2
-rw-r--r--components/script/dom/securitypolicyviolationevent.rs4
-rw-r--r--components/script/script_thread.rs6
-rw-r--r--components/script/security_manager.rs2
-rw-r--r--components/script/task_queue.rs11
-rw-r--r--components/servo/build.rs2
-rw-r--r--components/servo/lib.rs1
-rw-r--r--components/shared/base/cross_process_instant.rs2
-rw-r--r--ports/servoshell/desktop/webview.rs2
22 files changed, 44 insertions, 42 deletions
diff --git a/components/script/devtools.rs b/components/script/devtools.rs
index 5e68b2d198e..b818f591971 100644
--- a/components/script/devtools.rs
+++ b/components/script/devtools.rs
@@ -236,7 +236,7 @@ pub fn handle_get_stylesheet_style(
};
Some(style.Style())
})
- .map(|style| {
+ .flat_map(|style| {
(0..style.Length()).map(move |i| {
let name = style.Item(i);
NodeStyle {
@@ -246,7 +246,6 @@ pub fn handle_get_stylesheet_style(
}
})
})
- .flatten()
.collect();
Some(styles)
@@ -279,7 +278,7 @@ pub fn handle_get_selectors(
let rule = list.Item(j)?;
let style = rule.downcast::<CSSStyleRule>()?;
let selector = style.SelectorText();
- let _ = elem.Matches(selector.clone()).ok()?.then_some(())?;
+ elem.Matches(selector.clone()).ok()?.then_some(())?;
Some((selector.into(), i))
}))
})
diff --git a/components/script/dom/bindings/proxyhandler.rs b/components/script/dom/bindings/proxyhandler.rs
index 315cff7bafb..f1f9f4bc4ba 100644
--- a/components/script/dom/bindings/proxyhandler.rs
+++ b/components/script/dom/bindings/proxyhandler.rs
@@ -259,7 +259,7 @@ unsafe fn id_to_source(cx: SafeJSContext, id: RawHandleId) -> Option<DOMString>
jsstr.set(jsapi::JS_ValueToSource(*cx, value.handle().into()));
jsstr.get()
})
- .and_then(|jsstr| ptr::NonNull::new(jsstr))
+ .and_then(ptr::NonNull::new)
.map(|jsstr| jsstring_to_str(*cx, jsstr))
}
diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs
index ae948c843cd..a1e5a269695 100644
--- a/components/script/dom/bindings/str.rs
+++ b/components/script/dom/bindings/str.rs
@@ -905,6 +905,6 @@ impl FromInputValueString for &str {
))
.unwrap()
});
- RE.is_match(&self)
+ RE.is_match(self)
}
}
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 15ade93ec6c..0852eeb7498 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -3242,7 +3242,7 @@ impl Document {
/// (Need to figure out what to do with the style attribute
/// of elements adopted into another document.)
static PER_PROCESS_AUTHOR_SHARED_LOCK: LazyLock<StyleSharedRwLock> =
- LazyLock::new(|| StyleSharedRwLock::new());
+ LazyLock::new(StyleSharedRwLock::new);
PER_PROCESS_AUTHOR_SHARED_LOCK.clone()
//StyleSharedRwLock::new()
diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs
index 863fbf9059e..172550f9622 100644
--- a/components/script/dom/file.rs
+++ b/components/script/dom/file.rs
@@ -37,7 +37,7 @@ impl File {
blob: Blob::new_inherited(blob_impl),
name,
// https://w3c.github.io/FileAPI/#dfn-lastModified
- modified: modified.unwrap_or_else(SystemTime::now).into(),
+ modified: modified.unwrap_or_else(SystemTime::now),
}
}
@@ -87,7 +87,7 @@ impl File {
normalize_type_string(&selected.type_string.to_string()),
),
name,
- Some(selected.modified.into()),
+ Some(selected.modified),
)
}
diff --git a/components/script/dom/gamepad.rs b/components/script/dom/gamepad.rs
index 953132e3f02..d3a5ed914d3 100644
--- a/components/script/dom/gamepad.rs
+++ b/components/script/dom/gamepad.rs
@@ -317,7 +317,7 @@ impl Gamepad {
}
pub fn vibration_actuator(&self) -> &GamepadHapticActuator {
- &*self.vibration_actuator
+ &self.vibration_actuator
}
}
diff --git a/components/script/dom/gamepadhapticactuator.rs b/components/script/dom/gamepadhapticactuator.rs
index 338ebdce766..a0aa8c562d1 100644
--- a/components/script/dom/gamepadhapticactuator.rs
+++ b/components/script/dom/gamepadhapticactuator.rs
@@ -96,7 +96,7 @@ impl GamepadHapticActuator {
}
Self {
reflector_: Reflector::new(),
- gamepad_index: gamepad_index.into(),
+ gamepad_index: gamepad_index,
effects,
playing_effect_promise: DomRefCell::new(None),
sequence_id: Cell::new(0),
@@ -118,7 +118,7 @@ impl GamepadHapticActuator {
gamepad_index: u32,
supported_haptic_effects: GamepadSupportedHapticEffects,
) -> DomRoot<GamepadHapticActuator> {
- let haptic_actuator = reflect_dom_object_with_proto(
+ reflect_dom_object_with_proto(
Box::new(GamepadHapticActuator::new_inherited(
gamepad_index,
supported_haptic_effects,
@@ -126,8 +126,7 @@ impl GamepadHapticActuator {
global,
None,
CanGc::note(),
- );
- haptic_actuator
+ )
}
}
@@ -367,7 +366,7 @@ impl GamepadHapticActuator {
return;
}
- let this = Trusted::new(&*self);
+ let this = Trusted::new(self);
let _ = self.global().gamepad_task_source().queue(
task!(stop_playing_effect: move || {
let actuator = this.root();
diff --git a/components/script/dom/gpubuffer.rs b/components/script/dom/gpubuffer.rs
index 488ef614b92..d90a37b559d 100644
--- a/components/script/dom/gpubuffer.rs
+++ b/components/script/dom/gpubuffer.rs
@@ -296,7 +296,7 @@ impl GPUBufferMethods for GPUBuffer {
let range_size = if let Some(s) = size {
s
} else {
- self.size.checked_sub(offset).unwrap_or(0)
+ self.size.saturating_sub(offset)
};
// Step 2: validation
let mut mapping = self.mapping.borrow_mut();
diff --git a/components/script/dom/gpuconvert.rs b/components/script/dom/gpuconvert.rs
index 8244935e07c..4bd53573d43 100644
--- a/components/script/dom/gpuconvert.rs
+++ b/components/script/dom/gpuconvert.rs
@@ -224,7 +224,7 @@ impl TryFrom<&GPUExtent3D> for wgt::Extent3d {
}),
GPUExtent3D::RangeEnforcedUnsignedLongSequence(ref v) => {
// https://gpuweb.github.io/gpuweb/#abstract-opdef-validate-gpuextent3d-shape
- if v.len() < 1 || v.len() > 3 {
+ if v.is_empty() || v.len() > 3 {
Err(Error::Type(
"GPUExtent3D size must be between 1 and 3 (inclusive)".to_string(),
))
@@ -460,7 +460,7 @@ impl TryFrom<&GPUOrigin3D> for wgt::Origin3d {
))
} else {
Ok(wgt::Origin3d {
- x: v.get(0).copied().unwrap_or(0),
+ x: v.first().copied().unwrap_or(0),
y: v.get(1).copied().unwrap_or(0),
z: v.get(2).copied().unwrap_or(0),
})
@@ -485,7 +485,7 @@ impl TryFrom<&GPUImageCopyTexture> for wgpu_com::ImageCopyTexture {
origin: ic_texture
.origin
.as_ref()
- .map(|origin| wgt::Origin3d::try_from(origin))
+ .map(wgt::Origin3d::try_from)
.transpose()?
.unwrap_or_default(),
aspect: match ic_texture.aspect {
@@ -497,12 +497,12 @@ impl TryFrom<&GPUImageCopyTexture> for wgpu_com::ImageCopyTexture {
}
}
-impl<'a> Into<Option<Cow<'a, str>>> for &GPUObjectDescriptorBase {
- fn into(self) -> Option<Cow<'a, str>> {
- if self.label.is_empty() {
+impl<'a> From<&GPUObjectDescriptorBase> for Option<Cow<'a, str>> {
+ fn from(val: &GPUObjectDescriptorBase) -> Self {
+ if val.label.is_empty() {
None
} else {
- Some(Cow::Owned(self.label.to_string()))
+ Some(Cow::Owned(val.label.to_string()))
}
}
}
diff --git a/components/script/dom/gpudevice.rs b/components/script/dom/gpudevice.rs
index 67b806b8550..ddf71100d61 100644
--- a/components/script/dom/gpudevice.rs
+++ b/components/script/dom/gpudevice.rs
@@ -478,7 +478,7 @@ impl GPUDeviceMethods for GPUDevice {
&self,
descriptor: &GPURenderPipelineDescriptor,
) -> Fallible<DomRoot<GPURenderPipeline>> {
- let (implicit_ids, desc) = self.parse_render_pipeline(&descriptor)?;
+ let (implicit_ids, desc) = self.parse_render_pipeline(descriptor)?;
let render_pipeline = GPURenderPipeline::create(self, implicit_ids, desc, None)?;
Ok(GPURenderPipeline::new(
&self.global(),
@@ -494,7 +494,7 @@ impl GPUDeviceMethods for GPUDevice {
descriptor: &GPURenderPipelineDescriptor,
comp: InRealm,
) -> Fallible<Rc<Promise>> {
- let (implicit_ids, desc) = self.parse_render_pipeline(&descriptor)?;
+ let (implicit_ids, desc) = self.parse_render_pipeline(descriptor)?;
let promise = Promise::new_in_current_realm(comp);
let sender = response_async(&promise, self);
GPURenderPipeline::create(self, implicit_ids, desc, Some(sender))?;
diff --git a/components/script/dom/gpurenderbundleencoder.rs b/components/script/dom/gpurenderbundleencoder.rs
index b32a7ac17a9..bc05a678f17 100644
--- a/components/script/dom/gpurenderbundleencoder.rs
+++ b/components/script/dom/gpurenderbundleencoder.rs
@@ -90,7 +90,7 @@ impl GPURenderBundleEncoder {
.map(|format| {
device
.validate_texture_format_required_features(format)
- .map(|f| Some(f))
+ .map(Some)
})
.collect::<Fallible<Vec<_>>>()?,
),
diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs
index 2fd4b8f3b5b..33f628df572 100644
--- a/components/script/dom/htmlheadelement.rs
+++ b/components/script/dom/htmlheadelement.rs
@@ -99,7 +99,7 @@ impl HTMLHeadElement {
.filter(|elem| {
elem.get_string_attribute(&local_name!("http-equiv"))
.to_ascii_lowercase() ==
- "content-security-policy".to_owned()
+ *"content-security-policy"
})
.filter(|elem| {
elem.get_attribute(&ns!(), &local_name!("content"))
diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs
index 825c01b4f9a..856cba42965 100644
--- a/components/script/dom/htmllinkelement.rs
+++ b/components/script/dom/htmllinkelement.rs
@@ -310,7 +310,7 @@ impl HTMLLinkElement {
// Step 2. Let options be a new link processing options
let destination = element
.get_attribute(&ns!(), &local_name!("as"))
- .map(|attr| translate_a_preload_destination(&*attr.value()))
+ .map(|attr| translate_a_preload_destination(&attr.value()))
.unwrap_or(Destination::None);
let mut options = LinkProcessingOptions {
@@ -383,7 +383,7 @@ impl HTMLLinkElement {
.networking_task_source_with_canceller();
let fetch_context = sync::Arc::new(sync::Mutex::new(PrefetchContext {
- url: url,
+ url,
link: Trusted::new(self),
resource_timing: ResourceFetchTiming::new(ResourceTimingType::Resource),
}));
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index f53f7193bdf..200ff011bb4 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -607,7 +607,7 @@ impl Node {
pub fn is_empty(&self) -> bool {
// A node is considered empty if its length is 0.
- return self.len() == 0;
+ self.len() == 0
}
/// <https://dom.spec.whatwg.org/#concept-tree-index>
diff --git a/components/script/dom/securitypolicyviolationevent.rs b/components/script/dom/securitypolicyviolationevent.rs
index 4826b75e17c..fe43afe076f 100644
--- a/components/script/dom/securitypolicyviolationevent.rs
+++ b/components/script/dom/securitypolicyviolationevent.rs
@@ -49,7 +49,7 @@ impl SecurityPolicyViolationEvent {
original_policy: init.originalPolicy.clone(),
source_file: init.sourceFile.clone(),
sample: init.sample.clone(),
- disposition: init.disposition.clone(),
+ disposition: init.disposition,
status_code: init.statusCode,
line_number: init.lineNumber,
column_number: init.columnNumber,
@@ -169,7 +169,7 @@ impl SecurityPolicyViolationEventMethods for SecurityPolicyViolationEvent {
/// <https://w3c.github.io/webappsec-csp/#dom-securitypolicyviolationevent-disposition>
fn Disposition(&self) -> SecurityPolicyViolationEventDisposition {
- self.disposition.clone()
+ self.disposition
}
/// <https://w3c.github.io/webappsec-csp/#dom-securitypolicyviolationevent-statuscode>
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index c8f366259d7..31bbc4c3d03 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1664,7 +1664,7 @@ impl ScriptThread {
.iter()
.filter(|(_, document)| document.window().is_top_level())
.flat_map(|(id, document)| {
- std::iter::once(id.clone()).chain(
+ std::iter::once(id).chain(
document
.iter_iframes()
.filter_map(|iframe| iframe.pipeline_id()),
@@ -2556,8 +2556,8 @@ impl ScriptThread {
DevtoolScriptControlMsg::EvaluateJS(id, s, reply) => match documents.find_window(id) {
Some(window) => {
let global = window.upcast::<GlobalScope>();
- let _aes = AutoEntryScript::new(&global);
- devtools::handle_evaluate_js(&global, s, reply)
+ let _aes = AutoEntryScript::new(global);
+ devtools::handle_evaluate_js(global, s, reply)
},
None => warn!("Message sent to closed pipeline {}.", id),
},
diff --git a/components/script/security_manager.rs b/components/script/security_manager.rs
index 42795895315..2040414384a 100644
--- a/components/script/security_manager.rs
+++ b/components/script/security_manager.rs
@@ -161,7 +161,7 @@ impl From<SecurityPolicyViolationReport> for SecurityPolicyViolationEventInit {
lineNumber: value.line_number,
columnNumber: value.column_number,
originalPolicy: value.original_policy.into(),
- disposition: value.disposition.into(),
+ disposition: value.disposition,
parent: EventInit::empty(),
}
}
diff --git a/components/script/task_queue.rs b/components/script/task_queue.rs
index 96fc49c81af..e63f8f72794 100644
--- a/components/script/task_queue.rs
+++ b/components/script/task_queue.rs
@@ -170,10 +170,13 @@ impl<T: QueuedTaskConversion> TaskQueue<T> {
),
};
let mut throttled_tasks = self.throttled.borrow_mut();
- throttled_tasks
- .entry(task_source.clone())
- .or_default()
- .push_back((worker, category, boxed, pipeline_id, task_source));
+ throttled_tasks.entry(task_source).or_default().push_back((
+ worker,
+ category,
+ boxed,
+ pipeline_id,
+ task_source,
+ ));
}
}
diff --git a/components/servo/build.rs b/components/servo/build.rs
index 65f751b89cb..16ca4580bba 100644
--- a/components/servo/build.rs
+++ b/components/servo/build.rs
@@ -49,7 +49,7 @@ fn find_python() -> PathBuf {
for name in &candidates {
// Command::new() allows us to omit the `.exe` suffix on windows
- if Command::new(&name)
+ if Command::new(name)
.arg("--version")
.output()
.is_ok_and(|out| out.status.success())
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index 0b9829b8710..5e409c1307e 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -1001,6 +1001,7 @@ fn get_layout_factory(legacy_layout: bool) -> Arc<dyn LayoutFactory> {
Arc::new(layout_thread_2020::LayoutFactoryImpl())
}
+#[allow(clippy::too_many_arguments)]
fn create_constellation(
user_agent: Cow<'static, str>,
config_dir: Option<PathBuf>,
diff --git a/components/shared/base/cross_process_instant.rs b/components/shared/base/cross_process_instant.rs
index 9c5652b835c..ff96fde0c35 100644
--- a/components/shared/base/cross_process_instant.rs
+++ b/components/shared/base/cross_process_instant.rs
@@ -100,7 +100,7 @@ mod platform {
unsafe { mach_timebase_info(&mut timebase_info) };
timebase_info
});
- &*TIMEBASE_INFO
+ &TIMEBASE_INFO
}
#[allow(unsafe_code)]
diff --git a/ports/servoshell/desktop/webview.rs b/ports/servoshell/desktop/webview.rs
index 75a8455fb4f..d9187906ad2 100644
--- a/ports/servoshell/desktop/webview.rs
+++ b/ports/servoshell/desktop/webview.rs
@@ -152,7 +152,7 @@ where
// Returns the existing preload data for the given WebView, or a new one.
fn ensure_preload_data_mut(&mut self, webview_id: &WebViewId) -> &mut WebViewPreloadData {
- if let Entry::Vacant(entry) = self.webview_preload_data.entry(webview_id.clone()) {
+ if let Entry::Vacant(entry) = self.webview_preload_data.entry(*webview_id) {
entry.insert(WebViewPreloadData::default());
}
self.webview_preload_data.get_mut(webview_id).unwrap()