aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--components/layout_thread/lib.rs16
-rw-r--r--components/layout_thread_2020/lib.rs16
-rw-r--r--components/script/dom/bindings/root.rs4
-rwxr-xr-xcomponents/script/dom/htmlinputelement.rs2
-rw-r--r--components/script/dom/htmllabelelement.rs2
-rw-r--r--components/script/dom/htmllegendelement.rs2
-rwxr-xr-xcomponents/script/dom/htmlobjectelement.rs2
-rw-r--r--components/script/dom/htmloutputelement.rs4
-rwxr-xr-xcomponents/script/dom/htmlselectelement.rs2
-rw-r--r--components/script/dom/nodelist.rs2
-rw-r--r--components/script/dom/webgl_extensions/wrapper.rs2
-rw-r--r--components/script/dom/webglrenderingcontext.rs8
-rw-r--r--components/script/script_thread.rs2
13 files changed, 32 insertions, 32 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs
index 736533989ff..c54d65700b0 100644
--- a/components/layout_thread/lib.rs
+++ b/components/layout_thread/lib.rs
@@ -509,10 +509,10 @@ impl LayoutThread {
}
/// Receives and dispatches messages from other threads.
- fn handle_request_helper<'a, 'b>(
+ fn handle_request_helper(
&mut self,
request: Msg,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
match request {
Msg::SetQuirksMode(mode) => self.handle_set_quirks_mode(mode),
@@ -561,10 +561,10 @@ impl LayoutThread {
}
}
- fn collect_reports<'a, 'b>(
+ fn collect_reports(
&self,
reports_chan: ReportsChan,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
let mut reports = vec![];
// Servo uses vanilla jemalloc, which doesn't have a
@@ -873,10 +873,10 @@ impl LayoutThread {
}
/// The high-level routine that performs layout.
- fn handle_reflow<'a, 'b>(
+ fn handle_reflow(
&mut self,
data: &mut ScriptReflowResult,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
let document = unsafe { ServoLayoutNode::new(&data.document) };
let document = document.as_document().unwrap();
@@ -1289,10 +1289,10 @@ impl LayoutThread {
);
}
- fn set_scroll_states<'a, 'b>(
+ fn set_scroll_states(
&mut self,
new_scroll_states: Vec<ScrollState>,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
let mut rw_data = possibly_locked_rw_data.lock();
let mut script_scroll_states = vec![];
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
index 441ada6c234..760bdc85240 100644
--- a/components/layout_thread_2020/lib.rs
+++ b/components/layout_thread_2020/lib.rs
@@ -489,10 +489,10 @@ impl LayoutThread {
}
/// Receives and dispatches messages from other threads.
- fn handle_request_helper<'a, 'b>(
+ fn handle_request_helper(
&mut self,
request: Msg,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
match request {
Msg::SetQuirksMode(mode) => self.handle_set_quirks_mode(mode),
@@ -522,10 +522,10 @@ impl LayoutThread {
}
}
- fn collect_reports<'a, 'b>(
+ fn collect_reports(
&self,
reports_chan: ReportsChan,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
let mut reports = vec![];
// Servo uses vanilla jemalloc, which doesn't have a
@@ -590,10 +590,10 @@ impl LayoutThread {
}
/// The high-level routine that performs layout.
- fn handle_reflow<'a, 'b>(
+ fn handle_reflow(
&mut self,
data: &mut ScriptReflowResult,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
let document = unsafe { ServoLayoutNode::<DOMLayoutData>::new(&data.document) };
let document = document.as_document().unwrap();
@@ -976,10 +976,10 @@ impl LayoutThread {
);
}
- fn set_scroll_states<'a, 'b>(
+ fn set_scroll_states(
&mut self,
new_scroll_states: Vec<ScrollState>,
- possibly_locked_rw_data: &mut RwData<'a, 'b>,
+ possibly_locked_rw_data: &mut RwData<'_, '_>,
) {
let mut rw_data = possibly_locked_rw_data.lock();
let mut script_scroll_states = vec![];
diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs
index 8bb772d368a..ed74173c7a3 100644
--- a/components/script/dom/bindings/root.rs
+++ b/components/script/dom/bindings/root.rs
@@ -88,7 +88,7 @@ unsafe impl<T> StableTraceObject for Dom<T>
where
T: DomObject,
{
- fn stable_trace_object<'a>(&'a self) -> *const dyn JSTraceable {
+ fn stable_trace_object(&self) -> *const dyn JSTraceable {
// The JSTraceable impl for Reflector doesn't actually do anything,
// so we need this shenanigan to actually trace the reflector of the
// T pointer in Dom<T>.
@@ -107,7 +107,7 @@ unsafe impl<T> StableTraceObject for MaybeUnreflectedDom<T>
where
T: DomObject,
{
- fn stable_trace_object<'a>(&'a self) -> *const dyn JSTraceable {
+ fn stable_trace_object(&self) -> *const dyn JSTraceable {
// The JSTraceable impl for Reflector doesn't actually do anything,
// so we need this shenanigan to actually trace the reflector of the
// T pointer in Dom<T>.
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index b5abb5c7578..644ba3b50fc 100755
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -2645,7 +2645,7 @@ impl FormControl for HTMLInputElement {
self.form_owner.set(form);
}
- fn to_element<'a>(&'a self) -> &'a Element {
+ fn to_element(&self) -> &Element {
self.upcast::<Element>()
}
}
diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs
index bb68baf7fe7..4f608afcff5 100644
--- a/components/script/dom/htmllabelelement.rs
+++ b/components/script/dom/htmllabelelement.rs
@@ -190,7 +190,7 @@ impl FormControl for HTMLLabelElement {
// form owner. Therefore it doesn't hold form owner itself.
}
- fn to_element<'a>(&'a self) -> &'a Element {
+ fn to_element(&self) -> &Element {
self.upcast::<Element>()
}
}
diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs
index ee27e9637c7..61e8df45fe8 100644
--- a/components/script/dom/htmllegendelement.rs
+++ b/components/script/dom/htmllegendelement.rs
@@ -103,7 +103,7 @@ impl FormControl for HTMLLegendElement {
self.form_owner.set(form);
}
- fn to_element<'a>(&'a self) -> &'a Element {
+ fn to_element(&self) -> &Element {
self.upcast::<Element>()
}
}
diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs
index 007b4950b62..318b39ee06f 100755
--- a/components/script/dom/htmlobjectelement.rs
+++ b/components/script/dom/htmlobjectelement.rs
@@ -175,7 +175,7 @@ impl FormControl for HTMLObjectElement {
self.form_owner.set(form);
}
- fn to_element<'a>(&'a self) -> &'a Element {
+ fn to_element(&self) -> &Element {
self.upcast::<Element>()
}
}
diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs
index 5e140c1aadc..256452eaaf2 100644
--- a/components/script/dom/htmloutputelement.rs
+++ b/components/script/dom/htmloutputelement.rs
@@ -152,7 +152,7 @@ impl HTMLOutputElementMethods for HTMLOutputElement {
}
impl VirtualMethods for HTMLOutputElement {
- fn super_type<'b>(&'b self) -> Option<&'b dyn VirtualMethods> {
+ fn super_type(&self) -> Option<&dyn VirtualMethods> {
Some(self.upcast::<HTMLElement>() as &dyn VirtualMethods)
}
@@ -176,7 +176,7 @@ impl FormControl for HTMLOutputElement {
self.form_owner.set(form);
}
- fn to_element<'a>(&'a self) -> &'a Element {
+ fn to_element(&self) -> &Element {
self.upcast::<Element>()
}
}
diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs
index c57180fece4..ed50de11a53 100755
--- a/components/script/dom/htmlselectelement.rs
+++ b/components/script/dom/htmlselectelement.rs
@@ -490,7 +490,7 @@ impl FormControl for HTMLSelectElement {
self.form_owner.set(form);
}
- fn to_element<'a>(&'a self) -> &'a Element {
+ fn to_element(&self) -> &Element {
self.upcast::<Element>()
}
}
diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs
index c20d3d57d44..d54cb9a8b57 100644
--- a/components/script/dom/nodelist.rs
+++ b/components/script/dom/nodelist.rs
@@ -138,7 +138,7 @@ impl NodeList {
}
}
- pub fn iter<'a>(&'a self) -> impl Iterator<Item = DomRoot<Node>> + 'a {
+ pub fn iter(&self) -> impl Iterator<Item = DomRoot<Node>> + '_ {
let len = self.Length();
// There is room for optimization here in non-simple cases,
// as calling Item repeatedly on a live list can involve redundant work.
diff --git a/components/script/dom/webgl_extensions/wrapper.rs b/components/script/dom/webgl_extensions/wrapper.rs
index 3351dbef2a0..8549f87e766 100644
--- a/components/script/dom/webgl_extensions/wrapper.rs
+++ b/components/script/dom/webgl_extensions/wrapper.rs
@@ -87,7 +87,7 @@ where
T::name()
}
- fn as_any<'a>(&'a self) -> &'a dyn Any {
+ fn as_any(&self) -> &dyn Any {
self
}
}
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 91c98e87f6f..cc15c4c3dc6 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -1575,7 +1575,7 @@ impl WebGLRenderingContext {
constants::COLOR_ATTACHMENT0 <= attachment && attachment <= last_slot
}
- pub fn compressed_tex_image_2d<'a>(
+ pub fn compressed_tex_image_2d(
&self,
target: u32,
level: i32,
@@ -1583,7 +1583,7 @@ impl WebGLRenderingContext {
width: i32,
height: i32,
border: i32,
- data: &'a [u8],
+ data: &[u8],
) {
let validator = CompressedTexImage2DValidator::new(
self,
@@ -1642,7 +1642,7 @@ impl WebGLRenderingContext {
}
}
- pub fn compressed_tex_sub_image_2d<'a>(
+ pub fn compressed_tex_sub_image_2d(
&self,
target: u32,
level: i32,
@@ -1651,7 +1651,7 @@ impl WebGLRenderingContext {
width: i32,
height: i32,
format: u32,
- data: &'a [u8],
+ data: &[u8],
) {
let validator = CompressedTexSubImage2DValidator::new(
self,
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 450331eafe6..3a7aba8d820 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -478,7 +478,7 @@ impl Documents {
.and_then(|doc| doc.find_iframe(browsing_context_id))
}
- pub fn iter<'a>(&'a self) -> DocumentsIter<'a> {
+ pub fn iter(&self) -> DocumentsIter<'_> {
DocumentsIter {
iter: self.map.iter(),
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 08:11:06 +0000