diff options
author | Martin Robinson <mrobinson@igalia.com> | 2025-01-03 19:54:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-03 18:54:44 +0000 |
commit | 621ddd749c7655a93547f52a438f2e2941d7df15 (patch) | |
tree | da88d5b18302c99f543809063ba7dfd73645d8f4 /components/script | |
parent | 92026cb094ed274037c48831f1bad59430e199af (diff) | |
download | servo-621ddd749c7655a93547f52a438f2e2941d7df15.tar.gz servo-621ddd749c7655a93547f52a438f2e2941d7df15.zip |
Elide lifetimes where possible after rustup (#34824)
The new version of rust allows us to elide some lifetimes and clippy is
now complaining about this. This change elides them where possible and
removes the clippy exceptions.
Fixes #34804.
Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/script')
28 files changed, 38 insertions, 39 deletions
diff --git a/components/script/document_collection.rs b/components/script/document_collection.rs index 778fef202ac..bcff897910e 100644 --- a/components/script/document_collection.rs +++ b/components/script/document_collection.rs @@ -105,7 +105,7 @@ pub struct DocumentsIter<'a> { iter: hash_map::Iter<'a, PipelineId, Dom<Document>>, } -impl<'a> Iterator for DocumentsIter<'a> { +impl Iterator for DocumentsIter<'_> { type Item = (PipelineId, DomRoot<Document>); fn next(&mut self) -> Option<(PipelineId, DomRoot<Document>)> { diff --git a/components/script/dom/audiocontext.rs b/components/script/dom/audiocontext.rs index 544b8bb474a..a42809caae8 100644 --- a/components/script/dom/audiocontext.rs +++ b/components/script/dom/audiocontext.rs @@ -315,7 +315,7 @@ impl Convert<LatencyCategory> for AudioContextLatencyCategory { } } -impl<'a> Convert<RealTimeAudioContextOptions> for &'a AudioContextOptions { +impl Convert<RealTimeAudioContextOptions> for &AudioContextOptions { fn convert(self) -> RealTimeAudioContextOptions { RealTimeAudioContextOptions { sample_rate: *self.sampleRate.unwrap_or(Finite::wrap(44100.)), diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs index 5f1ec6d1c07..b59db051de5 100644 --- a/components/script/dom/bindings/callback.rs +++ b/components/script/dom/bindings/callback.rs @@ -216,7 +216,7 @@ impl<T: DomObject> ThisReflector for T { } } -impl<'a> ThisReflector for HandleObject<'a> { +impl ThisReflector for HandleObject<'_> { fn jsobject(&self) -> *mut JSObject { self.get() } diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs index 814ba48f593..6ca8a5f9cee 100644 --- a/components/script/dom/bindings/root.rs +++ b/components/script/dom/bindings/root.rs @@ -260,7 +260,7 @@ impl<'a> ThreadLocalStackRoots<'a> { } } -impl<'a> Drop for ThreadLocalStackRoots<'a> { +impl Drop for ThreadLocalStackRoots<'_> { fn drop(&mut self) { STACK_ROOTS.with(|r| r.set(None)); } @@ -698,7 +698,7 @@ impl<T: DomObject> PartialEq for MutNullableDom<T> { } } -impl<'a, T: DomObject> PartialEq<Option<&'a T>> for MutNullableDom<T> { +impl<T: DomObject> PartialEq<Option<&T>> for MutNullableDom<T> { fn eq(&self, other: &Option<&T>) -> bool { unsafe { *self.ptr.get() == other.map(Dom::from_ref) } } diff --git a/components/script/dom/bindings/str.rs b/components/script/dom/bindings/str.rs index 40d481cfed6..44e8466adda 100644 --- a/components/script/dom/bindings/str.rs +++ b/components/script/dom/bindings/str.rs @@ -356,7 +356,7 @@ impl From<String> for DOMString { } } -impl<'a> From<&'a str> for DOMString { +impl From<&str> for DOMString { fn from(contents: &str) -> DOMString { DOMString::from(String::from(contents)) } diff --git a/components/script/dom/biquadfilternode.rs b/components/script/dom/biquadfilternode.rs index 4c319462ad6..4734e2921fa 100644 --- a/components/script/dom/biquadfilternode.rs +++ b/components/script/dom/biquadfilternode.rs @@ -187,7 +187,7 @@ impl BiquadFilterNodeMethods<crate::DomTypeHolder> for BiquadFilterNode { } } -impl<'a> Convert<BiquadFilterNodeOptions> for &'a BiquadFilterOptions { +impl Convert<BiquadFilterNodeOptions> for &BiquadFilterOptions { fn convert(self) -> BiquadFilterNodeOptions { BiquadFilterNodeOptions { gain: *self.gain, diff --git a/components/script/dom/canvasgradient.rs b/components/script/dom/canvasgradient.rs index 51bdf30ad79..2d7d1789026 100644 --- a/components/script/dom/canvasgradient.rs +++ b/components/script/dom/canvasgradient.rs @@ -75,7 +75,7 @@ pub trait ToFillOrStrokeStyle { fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle; } -impl<'a> ToFillOrStrokeStyle for &'a CanvasGradient { +impl ToFillOrStrokeStyle for &CanvasGradient { fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle { let gradient_stops = self.stops.borrow().clone(); match self.style { diff --git a/components/script/dom/canvaspattern.rs b/components/script/dom/canvaspattern.rs index 6224500ca4a..238c561e880 100644 --- a/components/script/dom/canvaspattern.rs +++ b/components/script/dom/canvaspattern.rs @@ -70,7 +70,7 @@ impl CanvasPattern { } } -impl<'a> ToFillOrStrokeStyle for &'a CanvasPattern { +impl ToFillOrStrokeStyle for &CanvasPattern { fn to_fill_or_stroke_style(self) -> FillOrStrokeStyle { FillOrStrokeStyle::Surface(SurfaceStyle::new( self.surface_data.clone(), diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 6cdae855dba..45684477b84 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -83,7 +83,7 @@ impl<'a> AutoWorkerReset<'a> { } } -impl<'a> Drop for AutoWorkerReset<'a> { +impl Drop for AutoWorkerReset<'_> { fn drop(&mut self) { self.workerscope .worker diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index b84e6739f9e..b7c2949660f 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -681,7 +681,7 @@ pub trait LayoutElementHelpers<'dom> { fn get_attr_vals_for_layout(self, name: &LocalName) -> Vec<&'dom AttrValue>; } -impl<'dom> LayoutDom<'dom, Element> { +impl LayoutDom<'_, Element> { pub(super) fn focus_state(self) -> bool { self.unsafe_get().state.get().contains(ElementState::FOCUS) } @@ -4361,7 +4361,7 @@ pub enum AttributeMutation<'a> { Removed, } -impl<'a> AttributeMutation<'a> { +impl AttributeMutation<'_> { pub fn is_removal(&self) -> bool { match *self { AttributeMutation::Removed => true, diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index f5dbe6cd299..e3271211190 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -1383,7 +1383,7 @@ pub enum FormSubmitterElement<'a> { // (including custom elements) that can be passed as submitter. } -impl<'a> FormSubmitterElement<'a> { +impl FormSubmitterElement<'_> { fn action(&self) -> DOMString { match *self { FormSubmitterElement::Form(form) => form.Action(), diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index b2aaba04517..1a8eb3c6c06 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -195,7 +195,7 @@ impl InputType { } } -impl<'a> From<&'a Atom> for InputType { +impl From<&Atom> for InputType { fn from(value: &Atom) -> InputType { match value.to_ascii_lowercase() { atom!("button") => InputType::Button, diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index 591a330ad40..32bf6aae815 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -73,7 +73,7 @@ trait ProcessDataURL { fn process_data_url(&self); } -impl<'a> ProcessDataURL for &'a HTMLObjectElement { +impl ProcessDataURL for &HTMLObjectElement { // Makes the local `data` member match the status of the `data` attribute and starts /// prefetching the image. This method must be called after `data` is changed. fn process_data_url(&self) { diff --git a/components/script/dom/oscillatornode.rs b/components/script/dom/oscillatornode.rs index 6cc0559cbed..c9b349e4e60 100644 --- a/components/script/dom/oscillatornode.rs +++ b/components/script/dom/oscillatornode.rs @@ -157,7 +157,7 @@ impl OscillatorNodeMethods<crate::DomTypeHolder> for OscillatorNode { } } -impl<'a> Convert<ServoMediaOscillatorOptions> for &'a OscillatorOptions { +impl Convert<ServoMediaOscillatorOptions> for &OscillatorOptions { fn convert(self) -> ServoMediaOscillatorOptions { ServoMediaOscillatorOptions { oscillator_type: self.type_.convert(), diff --git a/components/script/dom/pannernode.rs b/components/script/dom/pannernode.rs index 2912cb4a474..5600342bc15 100644 --- a/components/script/dom/pannernode.rs +++ b/components/script/dom/pannernode.rs @@ -373,7 +373,7 @@ impl PannerNodeMethods<crate::DomTypeHolder> for PannerNode { } } -impl<'a> Convert<PannerNodeOptions> for &'a PannerOptions { +impl Convert<PannerNodeOptions> for &PannerOptions { fn convert(self) -> PannerNodeOptions { PannerNodeOptions { panning_model: self.panningModel.convert(), diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs index 689626f10d2..6495d9e1ec5 100644 --- a/components/script/dom/rtcpeerconnection.rs +++ b/components/script/dom/rtcpeerconnection.rs @@ -837,7 +837,7 @@ impl Convert<RTCSessionDescriptionInit> for SessionDescription { } } -impl<'a> Convert<SessionDescription> for &'a RTCSessionDescriptionInit { +impl Convert<SessionDescription> for &RTCSessionDescriptionInit { fn convert(self) -> SessionDescription { let type_ = match self.type_ { RTCSdpType::Answer => SdpType::Answer, diff --git a/components/script/dom/servoparser/html.rs b/components/script/dom/servoparser/html.rs index 9d0b331fab2..b4102a2c153 100644 --- a/components/script/dom/servoparser/html.rs +++ b/components/script/dom/servoparser/html.rs @@ -212,7 +212,7 @@ impl Iterator for SerializationIterator { } } -impl<'a> Serialize for &'a Node { +impl Serialize for &Node { fn serialize<S: Serializer>( &self, serializer: &mut S, diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index 036c8987633..36127c1ad1b 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -456,7 +456,7 @@ impl TreeWalker { } } -impl<'a> Iterator for &'a TreeWalker { +impl Iterator for &TreeWalker { type Item = DomRoot<Node>; fn next(&mut self) -> Option<DomRoot<Node>> { diff --git a/components/script/dom/webgl_validations/tex_image_2d.rs b/components/script/dom/webgl_validations/tex_image_2d.rs index c8ab11b87d8..2fad80a8b34 100644 --- a/components/script/dom/webgl_validations/tex_image_2d.rs +++ b/components/script/dom/webgl_validations/tex_image_2d.rs @@ -107,7 +107,7 @@ pub struct CommonTexImage2DValidatorResult { pub border: u32, } -impl<'a> WebGLValidator for CommonTexImage2DValidator<'a> { +impl WebGLValidator for CommonTexImage2DValidator<'_> { type Error = TexImageValidationError; type ValidatedOutput = CommonTexImage2DValidatorResult; fn validate(self) -> Result<Self::ValidatedOutput, TexImageValidationError> { @@ -299,7 +299,7 @@ pub struct TexImage2DValidatorResult { /// TexImage2d validator as per /// <https://www.khronos.org/opengles/sdk/docs/man/xhtml/glTexImage2D.xml> -impl<'a> WebGLValidator for TexImage2DValidator<'a> { +impl WebGLValidator for TexImage2DValidator<'_> { type ValidatedOutput = TexImage2DValidatorResult; type Error = TexImageValidationError; @@ -459,7 +459,7 @@ fn is_subimage_blockaligned( (height % block_height == 0 || yoffset + height == tex_info.height()) } -impl<'a> WebGLValidator for CommonCompressedTexImage2DValidator<'a> { +impl WebGLValidator for CommonCompressedTexImage2DValidator<'_> { type Error = TexImageValidationError; type ValidatedOutput = CommonCompressedTexImage2DValidatorResult; @@ -537,7 +537,7 @@ impl<'a> CompressedTexImage2DValidator<'a> { } } -impl<'a> WebGLValidator for CompressedTexImage2DValidator<'a> { +impl WebGLValidator for CompressedTexImage2DValidator<'_> { type Error = TexImageValidationError; type ValidatedOutput = CommonCompressedTexImage2DValidatorResult; @@ -617,7 +617,7 @@ impl<'a> CompressedTexSubImage2DValidator<'a> { } } -impl<'a> WebGLValidator for CompressedTexSubImage2DValidator<'a> { +impl WebGLValidator for CompressedTexSubImage2DValidator<'_> { type Error = TexImageValidationError; type ValidatedOutput = CommonCompressedTexImage2DValidatorResult; @@ -728,7 +728,7 @@ impl<'a> TexStorageValidator<'a> { } } -impl<'a> WebGLValidator for TexStorageValidator<'a> { +impl WebGLValidator for TexStorageValidator<'_> { type Error = TexImageValidationError; type ValidatedOutput = TexStorageValidatorResult; diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs index ec95cf0458b..5c5a6da9677 100644 --- a/components/script/layout_dom/element.rs +++ b/components/script/layout_dom/element.rs @@ -56,7 +56,7 @@ pub struct ServoLayoutElement<'dom> { element: LayoutDom<'dom, Element>, } -impl<'dom> fmt::Debug for ServoLayoutElement<'dom> { +impl fmt::Debug for ServoLayoutElement<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { write!(f, "<{}", self.element.local_name())?; if let Some(id) = self.id() { @@ -800,7 +800,7 @@ impl<'dom> ThreadSafeLayoutElement<'dom> for ServoThreadSafeLayoutElement<'dom> /// /// Note that the element implementation is needed only for selector matching, /// not for inheritance (styles are inherited appropriately). -impl<'dom> ::selectors::Element for ServoThreadSafeLayoutElement<'dom> { +impl ::selectors::Element for ServoThreadSafeLayoutElement<'_> { type Impl = SelectorImpl; fn opaque(&self) -> ::selectors::OpaqueElement { diff --git a/components/script/layout_dom/node.rs b/components/script/layout_dom/node.rs index 0b2b939cda4..20993d7263c 100644 --- a/components/script/layout_dom/node.rs +++ b/components/script/layout_dom/node.rs @@ -59,7 +59,7 @@ pub struct ServoLayoutNode<'dom> { unsafe impl Send for ServoLayoutNode<'_> {} unsafe impl Sync for ServoLayoutNode<'_> {} -impl<'dom> fmt::Debug for ServoLayoutNode<'dom> { +impl fmt::Debug for ServoLayoutNode<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { if let Some(el) = self.as_element() { el.fmt(f) @@ -95,7 +95,7 @@ impl<'dom> ServoLayoutNode<'dom> { } } -impl<'dom> style::dom::NodeInfo for ServoLayoutNode<'dom> { +impl style::dom::NodeInfo for ServoLayoutNode<'_> { fn is_element(&self) -> bool { self.node.is_element_for_layout() } @@ -262,7 +262,7 @@ impl<'dom> ServoThreadSafeLayoutNode<'dom> { } } -impl<'dom> style::dom::NodeInfo for ServoThreadSafeLayoutNode<'dom> { +impl style::dom::NodeInfo for ServoThreadSafeLayoutNode<'_> { fn is_element(&self) -> bool { self.node.is_element() } diff --git a/components/script/layout_dom/shadow_root.rs b/components/script/layout_dom/shadow_root.rs index 0763e150eff..4c42db9d941 100644 --- a/components/script/layout_dom/shadow_root.rs +++ b/components/script/layout_dom/shadow_root.rs @@ -18,7 +18,7 @@ pub struct ServoShadowRoot<'dom> { shadow_root: LayoutDom<'dom, ShadowRoot>, } -impl<'dom> fmt::Debug for ServoShadowRoot<'dom> { +impl fmt::Debug for ServoShadowRoot<'_> { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { self.as_node().fmt(f) } diff --git a/components/script/lib.rs b/components/script/lib.rs index 360e5e492ad..e406eb084fb 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -11,7 +11,6 @@ #![register_tool(crown)] #![cfg_attr(any(doc, clippy), allow(unknown_lints))] #![deny(crown_is_not_used)] -#![allow(clippy::needless_lifetimes)] // These are used a lot so let's keep them for now #[macro_use] diff --git a/components/script/realms.rs b/components/script/realms.rs index 11171051025..5fb2b42e7d0 100644 --- a/components/script/realms.rs +++ b/components/script/realms.rs @@ -33,7 +33,7 @@ pub enum InRealm<'a> { Entered(&'a JSAutoRealm), } -impl<'a> InRealm<'a> { +impl InRealm<'_> { pub fn already(token: &AlreadyInRealm) -> InRealm { InRealm::Already(token) } diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs index 29ceee67501..8a820a7b6bd 100644 --- a/components/script/script_thread.rs +++ b/components/script/script_thread.rs @@ -463,7 +463,7 @@ impl<'a> ScriptMemoryFailsafe<'a> { } } -impl<'a> Drop for ScriptMemoryFailsafe<'a> { +impl Drop for ScriptMemoryFailsafe<'_> { #[allow(crown::unrooted_must_root)] fn drop(&mut self) { if let Some(owner) = self.owner { diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index 20cfc1f2f37..f31201bb4fc 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -302,7 +302,7 @@ impl<'a> StylesheetLoader<'a> { } } -impl<'a> StylesheetLoader<'a> { +impl StylesheetLoader<'_> { pub fn load( &self, source: StylesheetContextSource, @@ -373,7 +373,7 @@ pub(crate) fn stylesheet_fetch_request( .integrity_metadata(integrity_metadata) } -impl<'a> StyleStylesheetLoader for StylesheetLoader<'a> { +impl StyleStylesheetLoader for StylesheetLoader<'_> { /// Request a stylesheet after parsing a given `@import` rule, and return /// the constructed `@import` rule. fn request_stylesheet( diff --git a/components/script/stylesheet_set.rs b/components/script/stylesheet_set.rs index ddb2f608e57..c4794b62d12 100644 --- a/components/script/stylesheet_set.rs +++ b/components/script/stylesheet_set.rs @@ -18,7 +18,7 @@ where Document(&'a mut DocumentStylesheetSet<S>), } -impl<'a, S> StylesheetSetRef<'a, S> +impl<S> StylesheetSetRef<'_, S> where S: StylesheetInDocument + PartialEq + 'static, { diff --git a/components/script/xpath/context.rs b/components/script/xpath/context.rs index 90873a89776..09bd36ded60 100644 --- a/components/script/xpath/context.rs +++ b/components/script/xpath/context.rs @@ -78,7 +78,7 @@ pub struct EvalNodesetIter<'a> { size: usize, } -impl<'a> Iterator for EvalNodesetIter<'a> { +impl Iterator for EvalNodesetIter<'_> { type Item = EvaluationCtx; fn next(&mut self) -> Option<EvaluationCtx> { |