diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs
index 183b329468d..c55767ff7a0 100644
--- a/components/canvas/raqote_backend.rs
+++ b/components/canvas/raqote_backend.rs
@@ -135,7 +135,7 @@ impl Repetition {
     }
 }
 
-pub fn source(pattern: &Pattern) -> raqote::Source {
+pub fn source(pattern: &Pattern) -> raqote::Source<'_> {
     match pattern {
         Pattern::Color(a, r, g, b) => raqote::Source::Solid(
             raqote::SolidSource::from_unpremultiplied_argb(*a, *r, *g, *b),
diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs
index a8065bd667c..f85222b84de 100644
--- a/components/compositing/compositor.rs
+++ b/components/compositing/compositor.rs
@@ -1376,7 +1376,7 @@ impl IOCompositor {
     }
 
     /// Get the message receiver for this [`IOCompositor`].
-    pub fn receiver(&self) -> Ref<Receiver<CompositorMsg>> {
+    pub fn receiver(&self) -> Ref<'_, Receiver<CompositorMsg>> {
         Ref::map(self.global.borrow(), |global| &global.compositor_receiver)
     }
 
diff --git a/components/compositing/webview_renderer.rs b/components/compositing/webview_renderer.rs
index b4380aa2cb7..ac0b6fd82aa 100644
--- a/components/compositing/webview_renderer.rs
+++ b/components/compositing/webview_renderer.rs
@@ -187,7 +187,7 @@ impl WebViewRenderer {
 
     pub(crate) fn set_frame_tree(&mut self, frame_tree: &SendableFrameTree) {
         let pipeline_id = frame_tree.pipeline.id;
-        let old_pipeline_id = std::mem::replace(&mut self.root_pipeline_id, Some(pipeline_id));
+        let old_pipeline_id = self.root_pipeline_id.replace(pipeline_id);
 
         if old_pipeline_id != self.root_pipeline_id {
             debug!(
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index c539787a759..3d84d95636e 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -1019,7 +1019,7 @@ where
     fn fully_active_descendant_browsing_contexts_iter(
         &self,
         browsing_context_id: BrowsingContextId,
-    ) -> FullyActiveBrowsingContextsIterator {
+    ) -> FullyActiveBrowsingContextsIterator<'_> {
         FullyActiveBrowsingContextsIterator {
             stack: vec![browsing_context_id],
             pipelines: &self.pipelines,
@@ -1031,7 +1031,7 @@ where
     fn fully_active_browsing_contexts_iter(
         &self,
         webview_id: WebViewId,
-    ) -> FullyActiveBrowsingContextsIterator {
+    ) -> FullyActiveBrowsingContextsIterator<'_> {
         self.fully_active_descendant_browsing_contexts_iter(BrowsingContextId::from(webview_id))
     }
 
@@ -1039,7 +1039,7 @@ where
     fn all_descendant_browsing_contexts_iter(
         &self,
         browsing_context_id: BrowsingContextId,
-    ) -> AllBrowsingContextsIterator {
+    ) -> AllBrowsingContextsIterator<'_> {
         AllBrowsingContextsIterator {
             stack: vec![browsing_context_id],
             pipelines: &self.pipelines,
@@ -1157,6 +1157,7 @@ where
     /// Handles loading pages, navigation, and granting access to the compositor
     #[servo_tracing::instrument(skip_all)]
     fn handle_request(&mut self) {
+        #[allow(clippy::large_enum_variant)]
         #[derive(Debug)]
         enum Request {
             PipelineNamespace(PipelineNamespaceRequest),
@@ -3174,7 +3175,8 @@ where
                     );
                 },
             };
-            let is_parent_private = match self.browsing_contexts.get(&parent_browsing_context_id) {
+
+            match self.browsing_contexts.get(&parent_browsing_context_id) {
                 Some(ctx) => ctx.is_private,
                 None => {
                     return warn!(
@@ -3182,8 +3184,7 @@ where
                         parent_browsing_context_id, browsing_context_id,
                     );
                 },
-            };
-            is_parent_private
+            }
         };
         let is_private = is_private || is_parent_private;
 
diff --git a/components/devtools/actors/inspector/page_style.rs b/components/devtools/actors/inspector/page_style.rs
index 5fa07dec3fd..5d1f9cd6ad1 100644
--- a/components/devtools/actors/inspector/page_style.rs
+++ b/components/devtools/actors/inspector/page_style.rs
@@ -175,42 +175,41 @@ impl PageStyleActor {
 
             // For each selector (plus an empty one that represents the style attribute)
             // get all of the rules associated with it.
-            let entries =
-                once(("".into(), usize::MAX))
-                    .chain(selectors)
-                    .filter_map(move |selector| {
-                        let rule = match node_actor.style_rules.borrow_mut().entry(selector) {
-                            Entry::Vacant(e) => {
-                                let name = registry.new_name("style-rule");
-                                let actor = StyleRuleActor::new(
-                                    name.clone(),
-                                    node_actor.name(),
-                                    (!e.key().0.is_empty()).then_some(e.key().clone()),
-                                );
-                                let rule = actor.applied(registry)?;
 
-                                registry.register_later(Box::new(actor));
-                                e.insert(name);
-                                rule
-                            },
-                            Entry::Occupied(e) => {
-                                let actor = registry.find::<StyleRuleActor>(e.get());
-                                actor.applied(registry)?
-                            },
-                        };
-                        if inherited.is_some() && rule.declarations.is_empty() {
-                            return None;
-                        }
+            once(("".into(), usize::MAX))
+                .chain(selectors)
+                .filter_map(move |selector| {
+                    let rule = match node_actor.style_rules.borrow_mut().entry(selector) {
+                        Entry::Vacant(e) => {
+                            let name = registry.new_name("style-rule");
+                            let actor = StyleRuleActor::new(
+                                name.clone(),
+                                node_actor.name(),
+                                (!e.key().0.is_empty()).then_some(e.key().clone()),
+                            );
+                            let rule = actor.applied(registry)?;
 
-                        Some(AppliedEntry {
-                            rule,
-                            // TODO: Handle pseudo elements
-                            pseudo_element: None,
-                            is_system: false,
-                            inherited: inherited.clone(),
-                        })
-                    });
-            entries
+                            registry.register_later(Box::new(actor));
+                            e.insert(name);
+                            rule
+                        },
+                        Entry::Occupied(e) => {
+                            let actor = registry.find::<StyleRuleActor>(e.get());
+                            actor.applied(registry)?
+                        },
+                    };
+                    if inherited.is_some() && rule.declarations.is_empty() {
+                        return None;
+                    }
+
+                    Some(AppliedEntry {
+                        rule,
+                        // TODO: Handle pseudo elements
+                        pseudo_element: None,
+                        is_system: false,
+                        inherited: inherited.clone(),
+                    })
+                })
         })
         .collect();
         let msg = GetAppliedReply {
diff --git a/components/fonts/font_context.rs b/components/fonts/font_context.rs
index a7df1ae3068..eb57075ffa7 100644
--- a/components/fonts/font_context.rs
+++ b/components/fonts/font_context.rs
@@ -320,7 +320,7 @@ impl FontContext {
                 font_key
             });
 
-        let key = *self
+        *self
             .webrender_font_instance_keys
             .write()
             .entry((font_key, pt_size, variations.clone()))
@@ -334,8 +334,7 @@ impl FontContext {
                     variations,
                 );
                 font_instance_key
-            });
-        key
+            })
     }
 
     fn invalidate_font_groups_after_web_font_load(&self) {
diff --git a/components/fonts/glyph.rs b/components/fonts/glyph.rs
index 954d30da560..f5457c1127a 100644
--- a/components/fonts/glyph.rs
+++ b/components/fonts/glyph.rs
@@ -606,7 +606,7 @@ impl GlyphStore {
     pub fn iter_glyphs_for_byte_range(
         &self,
         range: &Range<ByteIndex>,
-    ) -> impl Iterator<Item = GlyphInfo> + use<'_> {
+    ) -> impl Iterator<Item = GlyphInfo<'_>> + use<'_> {
         if range.begin() >= self.len() {
             panic!("iter_glyphs_for_range: range.begin beyond length!");
         }
diff --git a/components/hyper_serde/lib.rs b/components/hyper_serde/lib.rs
index 663faab8904..fc786035b54 100644
--- a/components/hyper_serde/lib.rs
+++ b/components/hyper_serde/lib.rs
@@ -431,6 +431,10 @@ impl Serialize for Ser<'_, HeaderMap> {
             {
                 let mut serializer = serializer.serialize_seq(Some(self.0.len()))?;
                 for v in self.0 {
+                    #[allow(
+                        clippy::collapsible_if,
+                        reason = "let chains are not available in 1.85"
+                    )]
                     if self.1 {
                         if let Ok(v) = str::from_utf8(v) {
                             serializer.serialize_element(v)?;
diff --git a/components/layout/flexbox/layout.rs b/components/layout/flexbox/layout.rs
index a76cedcff25..3f94f01528f 100644
--- a/components/layout/flexbox/layout.rs
+++ b/components/layout/flexbox/layout.rs
@@ -1001,7 +1001,7 @@ impl FlexContainer {
     }
 
     #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
+    pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
         LayoutStyle::Default(&self.style)
     }
 }
@@ -2046,7 +2046,7 @@ impl FlexItemBox {
         content_box_sizes_and_pbm: &ContentBoxSizesAndPBM,
         config: &FlexContainerConfig,
         flex_context_getter: &impl Fn() -> &'a FlexContext<'a>,
-    ) -> FlexItem {
+    ) -> FlexItem<'_> {
         let flex_axis = config.flex_axis;
         let style = self.style();
         let cross_axis_is_item_block_axis = cross_axis_is_item_block_axis(
diff --git a/components/layout/flexbox/mod.rs b/components/layout/flexbox/mod.rs
index ac51a86fcfe..4c477937306 100644
--- a/components/layout/flexbox/mod.rs
+++ b/components/layout/flexbox/mod.rs
@@ -151,6 +151,7 @@ impl FlexContainer {
     }
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, MallocSizeOf)]
 pub(crate) enum FlexLevelBox {
     FlexItem(FlexItemBox),
diff --git a/components/layout/flow/inline/inline_box.rs b/components/layout/flow/inline/inline_box.rs
index 960c489349d..26e8befeca9 100644
--- a/components/layout/flow/inline/inline_box.rs
+++ b/components/layout/flow/inline/inline_box.rs
@@ -66,7 +66,7 @@ impl InlineBox {
     }
 
     #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
+    pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
         LayoutStyle::Default(&self.base.style)
     }
 
diff --git a/components/layout/formatting_contexts.rs b/components/layout/formatting_contexts.rs
index 9b52a8888b9..5e989822a2b 100644
--- a/components/layout/formatting_contexts.rs
+++ b/components/layout/formatting_contexts.rs
@@ -355,7 +355,7 @@ impl IndependentFormattingContext {
     }
 
     #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
+    pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
         match &self.contents {
             IndependentFormattingContextContents::Replaced(fc) => fc.layout_style(&self.base),
             IndependentFormattingContextContents::Flow(fc) => fc.layout_style(&self.base),
diff --git a/components/layout/layout_impl.rs b/components/layout/layout_impl.rs
index 3c82c9734b2..869f34c6269 100644
--- a/components/layout/layout_impl.rs
+++ b/components/layout/layout_impl.rs
@@ -997,9 +997,11 @@ impl LayoutThread {
         }
 
         let root_node = root_element.as_node();
-        let damage_from_environment = viewport_changed
-            .then_some(RestyleDamage::RELAYOUT)
-            .unwrap_or_default();
+        let damage_from_environment = if viewport_changed {
+            RestyleDamage::RELAYOUT
+        } else {
+            Default::default()
+        };
         let damage = compute_damage_and_repair_style(
             &layout_context.style_context,
             root_node.to_threadsafe(),
diff --git a/components/layout/table/construct.rs b/components/layout/table/construct.rs
index 55dbf0d5e95..97d312645f5 100644
--- a/components/layout/table/construct.rs
+++ b/components/layout/table/construct.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 use std::borrow::Cow;
-use std::iter::repeat;
+use std::iter::repeat_n;
 
 use atomic_refcell::AtomicRef;
 use layout_api::wrapper_traits::ThreadSafeLayoutNode;
@@ -1165,6 +1165,6 @@ fn add_column(
             shared_background_style: SharedStyle::new(column_info.style.clone()),
         })
     });
-    collection.extend(repeat(column.clone()).take(span as usize));
+    collection.extend(repeat_n(column.clone(), span as usize));
     column
 }
diff --git a/components/layout/table/layout.rs b/components/layout/table/layout.rs
index d53b862b9b1..c85857e5d38 100644
--- a/components/layout/table/layout.rs
+++ b/components/layout/table/layout.rs
@@ -2754,21 +2754,21 @@ impl Table {
     }
 
     #[inline]
-    pub(crate) fn layout_style_for_grid(&self) -> LayoutStyle {
+    pub(crate) fn layout_style_for_grid(&self) -> LayoutStyle<'_> {
         LayoutStyle::Default(&self.grid_style)
     }
 }
 
 impl TableTrack {
     #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
+    pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
         LayoutStyle::Default(&self.base.style)
     }
 }
 
 impl TableTrackGroup {
     #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
+    pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
         LayoutStyle::Default(&self.base.style)
     }
 }
@@ -2806,7 +2806,7 @@ impl TableLayoutStyle<'_> {
 
 impl TableSlotCell {
     #[inline]
-    fn layout_style(&self) -> LayoutStyle {
+    fn layout_style(&self) -> LayoutStyle<'_> {
         self.contents.layout_style(&self.base)
     }
 
diff --git a/components/layout/taffy/layout.rs b/components/layout/taffy/layout.rs
index 95e4bf8a7b6..10eb59f8b65 100644
--- a/components/layout/taffy/layout.rs
+++ b/components/layout/taffy/layout.rs
@@ -576,7 +576,7 @@ impl TaffyContainer {
     }
 
     #[inline]
-    pub(crate) fn layout_style(&self) -> LayoutStyle {
+    pub(crate) fn layout_style(&self) -> LayoutStyle<'_> {
         LayoutStyle::Default(&self.style)
     }
 }
diff --git a/components/layout/taffy/mod.rs b/components/layout/taffy/mod.rs
index dd5f382b019..9610b88e6f2 100644
--- a/components/layout/taffy/mod.rs
+++ b/components/layout/taffy/mod.rs
@@ -91,6 +91,7 @@ pub(crate) struct TaffyItemBox {
     pub(crate) taffy_level_box: TaffyItemBoxInner,
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, MallocSizeOf)]
 pub(crate) enum TaffyItemBoxInner {
     InFlowBox(IndependentFormattingContext),
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index fabb63ef1be..e3471b50bb6 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -88,7 +88,7 @@ where
         node.layout_data().is_none() || !parent_data.damage.is_empty()
     }
 
-    fn shared_context(&self) -> &SharedStyleContext {
+    fn shared_context(&self) -> &SharedStyleContext<'_> {
         &self.context.style_context
     }
 }
diff --git a/components/media/lib.rs b/components/media/lib.rs
index bf1160956c1..82774d298ef 100644
--- a/components/media/lib.rs
+++ b/components/media/lib.rs
@@ -214,7 +214,7 @@ impl GLPlayerExternalImages {
 }
 
 impl WebrenderExternalImageApi for GLPlayerExternalImages {
-    fn lock(&mut self, id: u64) -> (ExternalImageSource, Size2D<i32>) {
+    fn lock(&mut self, id: u64) -> (ExternalImageSource<'_>, Size2D<i32>) {
         // The GLPlayerMsgForward::Lock message inserts a fence in the
         // GLPlayer command queue.
         self.glplayer_channel
diff --git a/components/net/decoder.rs b/components/net/decoder.rs
index 65399cc2bbc..d572b1e2b67 100644
--- a/components/net/decoder.rs
+++ b/components/net/decoder.rs
@@ -285,7 +285,7 @@ impl Stream for BodyStream {
                         return Poll::Ready(None);
                     }
                 }
-                Poll::Ready(Some(Err(io::Error::new(io::ErrorKind::Other, err))))
+                Poll::Ready(Some(Err(io::Error::other(err))))
             },
             None => Poll::Ready(None),
         }
diff --git a/components/net/fetch/methods.rs b/components/net/fetch/methods.rs
index 0f270695f1e..b77960fc772 100644
--- a/components/net/fetch/methods.rs
+++ b/components/net/fetch/methods.rs
@@ -832,7 +832,7 @@ fn create_about_memory(url: ServoUrl, timing_type: ResourceTimingType) -> Respon
 
 /// Handle a request from the user interface to ignore validation errors for a certificate.
 fn handle_allowcert_request(request: &mut Request, context: &FetchContext) -> io::Result<()> {
-    let error = |string| Err(io::Error::new(io::ErrorKind::Other, string));
+    let error = |string| Err(io::Error::other(string));
 
     let body = match request.body.as_mut() {
         Some(body) => body,
diff --git a/components/net/hosts.rs b/components/net/hosts.rs
index 48b74bba154..1d83957eea3 100644
--- a/components/net/hosts.rs
+++ b/components/net/hosts.rs
@@ -49,7 +49,7 @@ pub fn parse_hostsfile(hostsfile_content: &str) -> HashMap<String, IpAddr> {
         .collect()
 }
 
-pub fn replace_host(host: &str) -> Cow<str> {
+pub fn replace_host(host: &str) -> Cow<'_, str> {
     HOST_TABLE
         .lock()
         .unwrap()
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 4d0a07177d4..540c2dd8ed2 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -2017,7 +2017,7 @@ async fn http_network_fetch(
         .iter()
         .map(|header_value| header_value.to_str().unwrap_or(""))
         .collect();
-    let wildcard_present = header_strings.iter().any(|header_str| *header_str == "*");
+    let wildcard_present = header_strings.contains(&"*");
     // The spec: https://www.w3.org/TR/resource-timing-2/#sec-timing-allow-origin
     // says that a header string is either an origin or a wildcard so we can just do a straight
     // check against the document origin
diff --git a/components/net/indexeddb/engines/sqlite/database_model.rs b/components/net/indexeddb/engines/sqlite/database_model.rs
index ea512bfef99..0d3528c94b9 100644
--- a/components/net/indexeddb/engines/sqlite/database_model.rs
+++ b/components/net/indexeddb/engines/sqlite/database_model.rs
@@ -12,6 +12,7 @@ pub enum Column {
     Version,
 }
 
+#[allow(dead_code)]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Model {
     pub name: String,
diff --git a/components/net/indexeddb/engines/sqlite/object_store_index_model.rs b/components/net/indexeddb/engines/sqlite/object_store_index_model.rs
index 4b4f201669e..1a4490327ea 100644
--- a/components/net/indexeddb/engines/sqlite/object_store_index_model.rs
+++ b/components/net/indexeddb/engines/sqlite/object_store_index_model.rs
@@ -14,6 +14,7 @@ pub enum Column {
     MultiEntryIndex,
 }
 
+#[allow(dead_code)]
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Model {
     pub id: i32,
diff --git a/components/net/websocket_loader.rs b/components/net/websocket_loader.rs
index 26cdf9bc50f..3a83eac08ad 100644
--- a/components/net/websocket_loader.rs
+++ b/components/net/websocket_loader.rs
@@ -48,6 +48,8 @@ use crate::fetch::methods::{
 };
 use crate::hosts::replace_host;
 use crate::http_loader::HttpState;
+
+#[allow(clippy::result_large_err)]
 /// Create a tungstenite Request object for the initial HTTP request.
 /// This request contains `Origin`, `Sec-WebSocket-Protocol`, `Authorization`,
 /// and `Cookie` headers as appropriate.
@@ -105,6 +107,7 @@ fn create_request(
     Ok(request)
 }
 
+#[allow(clippy::result_large_err)]
 /// Process an HTTP response resulting from a WS handshake.
 /// This ensures that any `Cookie` or HSTS headers are recognized.
 /// Returns an error if the protocol selected by the handshake doesn't
diff --git a/components/pixels/lib.rs b/components/pixels/lib.rs
index 6f49b7bad52..016927e909a 100644
--- a/components/pixels/lib.rs
+++ b/components/pixels/lib.rs
@@ -149,7 +149,7 @@ pub fn flip_y_rgba8_image_inplace(size: Size2D<u32>, pixels: &mut [u8]) {
     }
 }
 
-pub fn rgba8_get_rect(pixels: &[u8], size: Size2D<u32>, rect: Rect<u32>) -> Cow<[u8]> {
+pub fn rgba8_get_rect(pixels: &[u8], size: Size2D<u32>, rect: Rect<u32>) -> Cow<'_, [u8]> {
     assert!(!rect.is_empty());
     assert!(Rect::from_size(size).contains_rect(&rect));
     assert_eq!(pixels.len() % 4, 0);
@@ -311,7 +311,7 @@ impl RasterImage {
         self.frames.len() > 1
     }
 
-    pub fn frames(&self) -> impl Iterator<Item = ImageFrameView> {
+    pub fn frames(&self) -> impl Iterator<Item = ImageFrameView<'_>> {
         self.frames.iter().map(|frame| ImageFrameView {
             delay: frame.delay,
             bytes: self.bytes.get(frame.byte_range.clone()).unwrap(),
@@ -320,7 +320,7 @@ impl RasterImage {
         })
     }
 
-    pub fn first_frame(&self) -> ImageFrameView {
+    pub fn first_frame(&self) -> ImageFrameView<'_> {
         self.frames()
             .next()
             .expect("All images should have at least one frame")
diff --git a/components/script/dom/abstractrange.rs b/components/script/dom/abstractrange.rs
index e3f58e1e826..8fd0cf9e750 100644
--- a/components/script/dom/abstractrange.rs
+++ b/components/script/dom/abstractrange.rs
@@ -45,7 +45,7 @@ impl AbstractRange {
         end_offset: u32,
         can_gc: CanGc,
     ) -> DomRoot<AbstractRange> {
-        let abstractrange = reflect_dom_object(
+        reflect_dom_object(
             Box::new(AbstractRange::new_inherited(
                 start_container,
                 start_offset,
@@ -54,8 +54,7 @@ impl AbstractRange {
             )),
             document.window(),
             can_gc,
-        );
-        abstractrange
+        )
     }
 
     pub(crate) fn start(&self) -> &BoundaryPoint {
diff --git a/components/script/dom/abstractworkerglobalscope.rs b/components/script/dom/abstractworkerglobalscope.rs
index 8282d586993..89676edc9c8 100644
--- a/components/script/dom/abstractworkerglobalscope.rs
+++ b/components/script/dom/abstractworkerglobalscope.rs
@@ -21,7 +21,10 @@ pub(crate) trait WorkerEventLoopMethods {
     type Event;
     fn task_queue(&self) -> &TaskQueue<Self::WorkerMsg>;
     fn handle_event(&self, event: Self::Event, can_gc: CanGc) -> bool;
-    fn handle_worker_post_event(&self, worker: &TrustedWorkerAddress) -> Option<AutoWorkerReset>;
+    fn handle_worker_post_event(
+        &self,
+        worker: &TrustedWorkerAddress,
+    ) -> Option<AutoWorkerReset<'_>>;
     fn from_control_msg(msg: Self::ControlMsg) -> Self::Event;
     fn from_worker_msg(msg: Self::WorkerMsg) -> Self::Event;
     fn from_devtools_msg(msg: DevtoolScriptControlMsg) -> Self::Event;
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs
index 08870e60ae5..5f0294174eb 100644
--- a/components/script/dom/attr.rs
+++ b/components/script/dom/attr.rs
@@ -198,7 +198,7 @@ impl Attr {
         &self.identifier
     }
 
-    pub(crate) fn value(&self) -> Ref<AttrValue> {
+    pub(crate) fn value(&self) -> Ref<'_, AttrValue> {
         self.value.borrow()
     }
 
diff --git a/components/script/dom/audiobuffer.rs b/components/script/dom/audiobuffer.rs
index 2df9ef5327f..025a608bacd 100644
--- a/components/script/dom/audiobuffer.rs
+++ b/components/script/dom/audiobuffer.rs
@@ -179,7 +179,7 @@ impl AudioBuffer {
         Some(result)
     }
 
-    pub(crate) fn get_channels(&self) -> Ref<Option<ServoMediaAudioBuffer>> {
+    pub(crate) fn get_channels(&self) -> Ref<'_, Option<ServoMediaAudioBuffer>> {
         if self.shared_channels.borrow().is_none() {
             let channels = self.acquire_contents();
             if channels.is_some() {
diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs
index 2ef7bce981b..0e24c8c2fcd 100644
--- a/components/script/dom/baseaudiocontext.rs
+++ b/components/script/dom/baseaudiocontext.rs
@@ -531,7 +531,7 @@ impl BaseAudioContextMethods<crate::DomTypeHolder> for BaseAudioContext {
                     task_source.queue(task!(audio_decode_eos: move || {
                         let this = this.root();
                         let decoded_audio = decoded_audio__.lock().unwrap();
-                        let length = if decoded_audio.len() >= 1 {
+                        let length = if !decoded_audio.is_empty() {
                             decoded_audio[0].len()
                         } else {
                             0
diff --git a/components/script/dom/bindings/buffer_source.rs b/components/script/dom/bindings/buffer_source.rs
index a271cad5643..551cf044eb2 100644
--- a/components/script/dom/bindings/buffer_source.rs
+++ b/components/script/dom/bindings/buffer_source.rs
@@ -887,7 +887,7 @@ impl DataBlock {
                 *cx,
                 range.end - range.start,
                 // SAFETY: This is safe because we have checked there is no overlapping view
-                (*raw)[range.clone()].as_mut_ptr() as _,
+                (&mut (*raw))[range.clone()].as_mut_ptr() as _,
                 Some(free_func),
                 raw as _,
             )
diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs
index ce050b482a9..8a87a5b5ba8 100644
--- a/components/script/dom/bindings/cell.rs
+++ b/components/script/dom/bindings/cell.rs
@@ -111,7 +111,7 @@ impl<T> DomRefCell<T> {
     ///
     /// Panics if the value is currently mutably borrowed.
     #[track_caller]
-    pub(crate) fn borrow(&self) -> Ref<T> {
+    pub(crate) fn borrow(&self) -> Ref<'_, T> {
         self.value.borrow()
     }
 
@@ -124,7 +124,7 @@ impl<T> DomRefCell<T> {
     ///
     /// Panics if the value is currently borrowed.
     #[track_caller]
-    pub(crate) fn borrow_mut(&self) -> RefMut<T> {
+    pub(crate) fn borrow_mut(&self) -> RefMut<'_, T> {
         self.value.borrow_mut()
     }
 
@@ -138,7 +138,7 @@ impl<T> DomRefCell<T> {
     /// # Panics
     ///
     /// Panics if this is called off the script thread.
-    pub(crate) fn try_borrow(&self) -> Result<Ref<T>, BorrowError> {
+    pub(crate) fn try_borrow(&self) -> Result<Ref<'_, T>, BorrowError> {
         assert_in_script();
         self.value.try_borrow()
     }
@@ -153,7 +153,7 @@ impl<T> DomRefCell<T> {
     /// # Panics
     ///
     /// Panics if this is called off the script thread.
-    pub(crate) fn try_borrow_mut(&self) -> Result<RefMut<T>, BorrowMutError> {
+    pub(crate) fn try_borrow_mut(&self) -> Result<RefMut<'_, T>, BorrowMutError> {
         assert_in_script();
         self.value.try_borrow_mut()
     }
diff --git a/components/script/dom/bindings/refcounted.rs b/components/script/dom/bindings/refcounted.rs
index 096950c2f1f..052b8dbccc1 100644
--- a/components/script/dom/bindings/refcounted.rs
+++ b/components/script/dom/bindings/refcounted.rs
@@ -114,8 +114,7 @@ impl TrustedPromise {
                 self.owner_thread,
                 live_references as *const _ as *const libc::c_void
             );
-            // Borrow-check error requires the redundant `let promise = ...; promise` here.
-            let promise = match live_references
+            match live_references
                 .promise_table
                 .borrow_mut()
                 .entry(self.dom_object)
@@ -133,8 +132,7 @@ impl TrustedPromise {
                     promise
                 },
                 Vacant(_) => unreachable!(),
-            };
-            promise
+            }
         })
     }
 
diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs
index 599254a5ad5..e03c7392471 100644
--- a/components/script/dom/bindings/root.rs
+++ b/components/script/dom/bindings/root.rs
@@ -64,11 +64,11 @@ pub(crate) trait ToLayout<T> {
     /// # Safety
     ///
     /// The `self` parameter to this method must meet all the requirements of [`ptr::NonNull::as_ref`].
-    unsafe fn to_layout(&self) -> LayoutDom<T>;
+    unsafe fn to_layout(&self) -> LayoutDom<'_, T>;
 }
 
 impl<T: DomObject> ToLayout<T> for Dom<T> {
-    unsafe fn to_layout(&self) -> LayoutDom<T> {
+    unsafe fn to_layout(&self) -> LayoutDom<'_, T> {
         assert_in_layout();
         LayoutDom {
             value: unsafe { self.as_ptr().as_ref().unwrap() },
@@ -266,7 +266,7 @@ impl<T: DomObject> MutNullableDom<T> {
     /// Retrieve a copy of the inner optional `Dom<T>` as `LayoutDom<T>`.
     /// For use by layout, which can't use safe types like Temporary.
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    pub(crate) unsafe fn get_inner_as_layout(&self) -> Option<LayoutDom<T>> {
+    pub(crate) unsafe fn get_inner_as_layout(&self) -> Option<LayoutDom<'_, T>> {
         assert_in_layout();
         unsafe { (*self.ptr.get()).as_ref().map(|js| js.to_layout()) }
     }
diff --git a/components/script/dom/bluetooth/bluetooth.rs b/components/script/dom/bluetooth/bluetooth.rs
index b43a41a7c3b..02bcadaee92 100644
--- a/components/script/dom/bluetooth/bluetooth.rs
+++ b/components/script/dom/bluetooth/bluetooth.rs
@@ -87,7 +87,7 @@ impl BluetoothExtraPermissionData {
         self.allowed_devices.borrow_mut().push(allowed_device);
     }
 
-    fn get_allowed_devices(&self) -> Ref<Vec<AllowedBluetoothDevice>> {
+    fn get_allowed_devices(&self) -> Ref<'_, Vec<AllowedBluetoothDevice>> {
         self.allowed_devices.borrow()
     }
 
diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs
index afe24148447..fa0e9fe537c 100644
--- a/components/script/dom/characterdata.rs
+++ b/components/script/dom/characterdata.rs
@@ -73,7 +73,7 @@ impl CharacterData {
     }
 
     #[inline]
-    pub(crate) fn data(&self) -> Ref<DOMString> {
+    pub(crate) fn data(&self) -> Ref<'_, DOMString> {
         self.data.borrow()
     }
 
diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs
index 3b89537d8dc..93df19026e8 100644
--- a/components/script/dom/cssstyledeclaration.rs
+++ b/components/script/dom/cssstyledeclaration.rs
@@ -76,8 +76,7 @@ impl CSSStyleOwner {
                 let document = el.owner_document();
                 let shared_lock = document.style_shared_lock();
                 let mut attr = el.style_attribute().borrow_mut().take();
-                let result = if attr.is_some() {
-                    let lock = attr.as_ref().unwrap();
+                let result = if let Some(lock) = attr.as_ref() {
                     let mut guard = shared_lock.write();
                     let pdb = lock.write_with(&mut guard);
                     f(pdb, &mut changed)
diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs
index 6bd9db4ae08..c7f9797157d 100644
--- a/components/script/dom/customelementregistry.rs
+++ b/components/script/dom/customelementregistry.rs
@@ -591,16 +591,13 @@ impl CustomElementRegistryMethods<crate::DomTypeHolder> for CustomElementRegistr
             return promise;
         }
 
-        // Steps 3, 4, 5
+        // Steps 3, 4, 5, 6
         let existing_promise = self.when_defined.borrow().get(&name).cloned();
-        let promise = existing_promise.unwrap_or_else(|| {
+        existing_promise.unwrap_or_else(|| {
             let promise = Promise::new_in_current_realm(comp, can_gc);
             self.when_defined.borrow_mut().insert(name, promise.clone());
             promise
-        });
-
-        // Step 6
-        promise
+        })
     }
     /// <https://html.spec.whatwg.org/multipage/#dom-customelementregistry-upgrade>
     fn Upgrade(&self, node: &Node) {
diff --git a/components/script/dom/datatransfer.rs b/components/script/dom/datatransfer.rs
index defdbebc3e9..73b6d4a4d43 100644
--- a/components/script/dom/datatransfer.rs
+++ b/components/script/dom/datatransfer.rs
@@ -85,7 +85,7 @@ impl DataTransfer {
         Self::new_with_proto(window, None, can_gc, data_store)
     }
 
-    pub(crate) fn data_store(&self) -> Option<Ref<DragDataStore>> {
+    pub(crate) fn data_store(&self) -> Option<Ref<'_, DragDataStore>> {
         Ref::filter_map(self.data_store.borrow(), |data_store| data_store.as_ref()).ok()
     }
 }
diff --git a/components/script/dom/datatransferitem.rs b/components/script/dom/datatransferitem.rs
index 41385f31ce9..3269fcdafc5 100644
--- a/components/script/dom/datatransferitem.rs
+++ b/components/script/dom/datatransferitem.rs
@@ -63,7 +63,7 @@ impl DataTransferItem {
         )
     }
 
-    fn item_kind(&self) -> Option<Ref<Kind>> {
+    fn item_kind(&self) -> Option<Ref<'_, Kind>> {
         Ref::filter_map(self.data_store.borrow(), |data_store| {
             data_store
                 .as_ref()
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index 96a3ecb7c9c..59aa4d17bf3 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -232,7 +232,10 @@ impl WorkerEventLoopMethods for DedicatedWorkerGlobalScope {
         self.handle_mixed_message(event, can_gc)
     }
 
-    fn handle_worker_post_event(&self, worker: &TrustedWorkerAddress) -> Option<AutoWorkerReset> {
+    fn handle_worker_post_event(
+        &self,
+        worker: &TrustedWorkerAddress,
+    ) -> Option<AutoWorkerReset<'_>> {
         let ar = AutoWorkerReset::new(self, worker.clone());
         Some(ar)
     }
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 89aa7a7deaa..044f66c276e 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -662,12 +662,12 @@ impl Document {
     }
 
     #[inline]
-    pub(crate) fn loader(&self) -> Ref<DocumentLoader> {
+    pub(crate) fn loader(&self) -> Ref<'_, DocumentLoader> {
         self.loader.borrow()
     }
 
     #[inline]
-    pub(crate) fn loader_mut(&self) -> RefMut<DocumentLoader> {
+    pub(crate) fn loader_mut(&self) -> RefMut<'_, DocumentLoader> {
         self.loader.borrow_mut()
     }
 
@@ -1755,7 +1755,7 @@ impl Document {
         }
     }
 
-    pub(crate) fn policy_container(&self) -> Ref<PolicyContainer> {
+    pub(crate) fn policy_container(&self) -> Ref<'_, PolicyContainer> {
         self.policy_container.borrow()
     }
 
@@ -2385,14 +2385,14 @@ impl Document {
 
     /// A reference to the [`IFrameCollection`] of this [`Document`], holding information about
     /// `<iframe>`s found within it.
-    pub(crate) fn iframes(&self) -> Ref<IFrameCollection> {
+    pub(crate) fn iframes(&self) -> Ref<'_, IFrameCollection> {
         self.iframes.borrow_mut().validate(self);
         self.iframes.borrow()
     }
 
     /// A mutable reference to the [`IFrameCollection`] of this [`Document`], holding information about
     /// `<iframe>`s found within it.
-    pub(crate) fn iframes_mut(&self) -> RefMut<IFrameCollection> {
+    pub(crate) fn iframes_mut(&self) -> RefMut<'_, IFrameCollection> {
         self.iframes.borrow_mut().validate(self);
         self.iframes.borrow_mut()
     }
@@ -2411,7 +2411,7 @@ impl Document {
             .set_navigation_start(navigation_start);
     }
 
-    pub(crate) fn get_interactive_metrics(&self) -> Ref<ProgressiveWebMetrics> {
+    pub(crate) fn get_interactive_metrics(&self) -> Ref<'_, ProgressiveWebMetrics> {
         self.interactive_time.borrow()
     }
 
@@ -2704,11 +2704,11 @@ impl Document {
         fonts.fulfill_ready_promise_if_needed(can_gc)
     }
 
-    pub(crate) fn id_map(&self) -> Ref<HashMapTracedValues<Atom, Vec<Dom<Element>>>> {
+    pub(crate) fn id_map(&self) -> Ref<'_, HashMapTracedValues<Atom, Vec<Dom<Element>>>> {
         self.id_map.borrow()
     }
 
-    pub(crate) fn name_map(&self) -> Ref<HashMapTracedValues<Atom, Vec<Dom<Element>>>> {
+    pub(crate) fn name_map(&self) -> Ref<'_, HashMapTracedValues<Atom, Vec<Dom<Element>>>> {
         self.name_map.borrow()
     }
 
@@ -3676,7 +3676,7 @@ impl Document {
             .map(|elements| DomRoot::from_ref(&*elements[0]))
     }
 
-    pub(crate) fn ensure_pending_restyle(&self, el: &Element) -> RefMut<PendingRestyle> {
+    pub(crate) fn ensure_pending_restyle(&self, el: &Element) -> RefMut<'_, PendingRestyle> {
         let map = self.pending_restyles.borrow_mut();
         RefMut::map(map, |m| {
             &mut m
@@ -4068,13 +4068,13 @@ impl Document {
         )
     }
 
-    pub(crate) fn get_elements_with_id(&self, id: &Atom) -> Ref<[Dom<Element>]> {
+    pub(crate) fn get_elements_with_id(&self, id: &Atom) -> Ref<'_, [Dom<Element>]> {
         Ref::map(self.id_map.borrow(), |map| {
             map.get(id).map(|vec| &**vec).unwrap_or_default()
         })
     }
 
-    pub(crate) fn get_elements_with_name(&self, name: &Atom) -> Ref<[Dom<Element>]> {
+    pub(crate) fn get_elements_with_name(&self, name: &Atom) -> Ref<'_, [Dom<Element>]> {
         Ref::map(self.name_map.borrow(), |map| {
             map.get(name).map(|vec| &**vec).unwrap_or_default()
         })
@@ -4115,7 +4115,7 @@ impl Document {
         self.animation_timeline.borrow().current_value()
     }
 
-    pub(crate) fn animations(&self) -> Ref<Animations> {
+    pub(crate) fn animations(&self) -> Ref<'_, Animations> {
         self.animations.borrow()
     }
 
@@ -4159,7 +4159,7 @@ impl Document {
         self.animations().send_pending_events(self.window(), can_gc);
     }
 
-    pub(crate) fn image_animation_manager(&self) -> Ref<ImageAnimationManager> {
+    pub(crate) fn image_animation_manager(&self) -> Ref<'_, ImageAnimationManager> {
         self.image_animation_manager.borrow()
     }
 
diff --git a/components/script/dom/dommatrixreadonly.rs b/components/script/dom/dommatrixreadonly.rs
index fdd36ababad..8954e8cab57 100644
--- a/components/script/dom/dommatrixreadonly.rs
+++ b/components/script/dom/dommatrixreadonly.rs
@@ -77,7 +77,7 @@ impl DOMMatrixReadOnly {
         }
     }
 
-    pub(crate) fn matrix(&self) -> Ref<Transform3D<f64>> {
+    pub(crate) fn matrix(&self) -> Ref<'_, Transform3D<f64>> {
         self.matrix.borrow()
     }
 
diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs
index 83c3d09be23..14368062dcb 100644
--- a/components/script/dom/domtokenlist.rs
+++ b/components/script/dom/domtokenlist.rs
@@ -89,10 +89,7 @@ impl DOMTokenList {
             )),
             Some(supported_tokens) => {
                 let token = Atom::from(token).to_ascii_lowercase();
-                if supported_tokens
-                    .iter()
-                    .any(|supported_token| *supported_token == token)
-                {
+                if supported_tokens.contains(&token) {
                     return Ok(true);
                 }
                 Ok(false)
@@ -123,12 +120,8 @@ impl DOMTokenListMethods<crate::DomTypeHolder> for DOMTokenList {
     /// <https://dom.spec.whatwg.org/#dom-domtokenlist-contains>
     fn Contains(&self, token: DOMString) -> bool {
         let token = Atom::from(token);
-        self.attribute().is_some_and(|attr| {
-            attr.value()
-                .as_tokens()
-                .iter()
-                .any(|atom: &Atom| *atom == token)
-        })
+        self.attribute()
+            .is_some_and(|attr| attr.value().as_tokens().contains(&token))
     }
 
     /// <https://dom.spec.whatwg.org/#dom-domtokenlist-add>
@@ -136,7 +129,7 @@ impl DOMTokenListMethods<crate::DomTypeHolder> for DOMTokenList {
         let mut atoms = self.element.get_tokenlist_attribute(&self.local_name);
         for token in &tokens {
             let token = self.check_token_exceptions(token)?;
-            if !atoms.iter().any(|atom| *atom == token) {
+            if !atoms.contains(&token) {
                 atoms.push(token);
             }
         }
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index af4a641fc92..a670fa8a240 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -355,15 +355,15 @@ impl Element {
         )
     }
 
-    fn rare_data(&self) -> Ref<Option<Box<ElementRareData>>> {
+    fn rare_data(&self) -> Ref<'_, Option<Box<ElementRareData>>> {
         self.rare_data.borrow()
     }
 
-    fn rare_data_mut(&self) -> RefMut<Option<Box<ElementRareData>>> {
+    fn rare_data_mut(&self) -> RefMut<'_, Option<Box<ElementRareData>>> {
         self.rare_data.borrow_mut()
     }
 
-    fn ensure_rare_data(&self) -> RefMut<Box<ElementRareData>> {
+    fn ensure_rare_data(&self) -> RefMut<'_, Box<ElementRareData>> {
         let mut rare_data = self.rare_data.borrow_mut();
         if rare_data.is_none() {
             *rare_data = Some(Default::default());
@@ -792,7 +792,7 @@ impl Element {
     /// Lazily initialize the raredata if it does not exist.
     pub(crate) fn registered_intersection_observers_mut(
         &self,
-    ) -> RefMut<Vec<IntersectionObserverRegistration>> {
+    ) -> RefMut<'_, Vec<IntersectionObserverRegistration>> {
         RefMut::map(self.ensure_rare_data(), |rare_data| {
             &mut rare_data.registered_intersection_observers
         })
@@ -800,8 +800,8 @@ impl Element {
 
     pub(crate) fn registered_intersection_observers(
         &self,
-    ) -> Option<Ref<Vec<IntersectionObserverRegistration>>> {
-        let rare_data: Ref<_> = self.rare_data.borrow();
+    ) -> Option<Ref<'_, Vec<IntersectionObserverRegistration>>> {
+        let rare_data: Ref<'_, _> = self.rare_data.borrow();
 
         if rare_data.is_none() {
             return None;
@@ -817,7 +817,7 @@ impl Element {
     pub(crate) fn get_intersection_observer_registration(
         &self,
         observer: &IntersectionObserver,
-    ) -> Option<Ref<IntersectionObserverRegistration>> {
+    ) -> Option<Ref<'_, IntersectionObserverRegistration>> {
         if let Some(registrations) = self.registered_intersection_observers() {
             registrations
                 .iter()
@@ -868,8 +868,7 @@ impl Element {
         let mut parser_input = CssParserInput::new(media_query);
         let mut parser = CssParser::new(&mut parser_input);
         let media_list = MediaList::parse(&context, &mut parser);
-        let result = media_list.evaluate(document.window().layout().device(), quirks_mode);
-        result
+        media_list.evaluate(document.window().layout().device(), quirks_mode)
     }
 
     /// <https://drafts.csswg.org/cssom-view/#scroll-a-target-into-view>
@@ -992,7 +991,7 @@ impl Element {
             if let Some(style) = element.style() {
                 let overflow_x = style.get_box().clone_overflow_x();
                 let overflow_y = style.get_box().clone_overflow_y();
-                return overflow_x.is_scrollable() || overflow_y.is_scrollable();
+                overflow_x.is_scrollable() || overflow_y.is_scrollable()
             } else {
                 false // Element without style is not a scrolling box
             }
@@ -1846,7 +1845,7 @@ impl Element {
         &self.namespace
     }
 
-    pub(crate) fn prefix(&self) -> Ref<Option<Prefix>> {
+    pub(crate) fn prefix(&self) -> Ref<'_, Option<Prefix>> {
         self.prefix.borrow()
     }
 
@@ -1854,7 +1853,7 @@ impl Element {
         *self.prefix.borrow_mut() = prefix;
     }
 
-    pub(crate) fn attrs(&self) -> Ref<[Dom<Attr>]> {
+    pub(crate) fn attrs(&self) -> Ref<'_, [Dom<Attr>]> {
         Ref::map(self.attrs.borrow(), |attrs| &**attrs)
     }
 
@@ -5216,7 +5215,7 @@ impl Element {
 
     // https://html.spec.whatwg.org/multipage/#category-submit
     pub(crate) fn as_maybe_validatable(&self) -> Option<&dyn Validatable> {
-        let element = match self.upcast::<Node>().type_id() {
+        match self.upcast::<Node>().type_id() {
             NodeTypeId::Element(ElementTypeId::HTMLElement(
                 HTMLElementTypeId::HTMLInputElement,
             )) => {
@@ -5260,8 +5259,7 @@ impl Element {
                 Some(element as &dyn Validatable)
             },
             _ => None,
-        };
-        element
+        }
     }
 
     pub(crate) fn is_invalid(&self, needs_update: bool, can_gc: CanGc) -> bool {
diff --git a/components/script/dom/filelist.rs b/components/script/dom/filelist.rs
index 8942ec92239..d99fdc9ad27 100644
--- a/components/script/dom/filelist.rs
+++ b/components/script/dom/filelist.rs
@@ -45,7 +45,7 @@ impl FileList {
         )
     }
 
-    pub(crate) fn iter_files(&self) -> Iter<Dom<File>> {
+    pub(crate) fn iter_files(&self) -> Iter<'_, Dom<File>> {
         self.list.iter()
     }
 }
diff --git a/components/script/dom/globalscope.rs b/components/script/dom/globalscope.rs
index d15a280cb71..f4e56d93cb9 100644
--- a/components/script/dom/globalscope.rs
+++ b/components/script/dom/globalscope.rs
@@ -925,7 +925,7 @@ impl GlobalScope {
         let dom_port = if let MessagePortState::Managed(_id, message_ports) =
             &mut *self.message_port_state.borrow_mut()
         {
-            let dom_port = if let Some(managed_port) = message_ports.get_mut(&port_id) {
+            if let Some(managed_port) = message_ports.get_mut(&port_id) {
                 if managed_port.pending {
                     unreachable!("CompleteDisentanglement msg received for a pending port.");
                 }
@@ -940,8 +940,7 @@ impl GlobalScope {
                 // can happen if the port has already been transferred out of this global,
                 // in which case the disentanglement will complete along with the transfer.
                 return;
-            };
-            dom_port
+            }
         } else {
             return;
         };
@@ -2038,8 +2037,8 @@ impl GlobalScope {
     /// Promote non-Slice blob:
     /// 1. Memory-based: The bytes in data slice will be transferred to file manager thread.
     /// 2. File-based: If set_valid, then activate the FileID so it can serve as URL
-    ///     Depending on set_valid, the returned FileID can be part of
-    ///     valid or invalid Blob URL.
+    ///    Depending on set_valid, the returned FileID can be part of
+    ///    valid or invalid Blob URL.
     pub(crate) fn promote(&self, blob_info: &mut BlobInfo, set_valid: bool) -> Uuid {
         let mut bytes = vec![];
         let global_url = self.get_url();
@@ -3239,7 +3238,7 @@ impl GlobalScope {
         }
     }
 
-    pub(crate) fn dynamic_module_list(&self) -> RefMut<DynamicModuleList> {
+    pub(crate) fn dynamic_module_list(&self) -> RefMut<'_, DynamicModuleList> {
         self.dynamic_modules.borrow_mut()
     }
 
diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs
index d60d0003833..0b651d41891 100644
--- a/components/script/dom/headers.rs
+++ b/components/script/dom/headers.rs
@@ -432,10 +432,7 @@ pub(crate) fn is_forbidden_request_header(name: &str, value: &[u8]) -> bool {
     // true
     let lowercase_name = name.to_lowercase();
 
-    if forbidden_header_names
-        .iter()
-        .any(|header| *header == lowercase_name.as_str())
-    {
+    if forbidden_header_names.contains(&lowercase_name.as_str()) {
         return true;
     }
 
diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs
index 046eacf73dc..19ffbf41e5d 100644
--- a/components/script/dom/htmlcanvaselement.rs
+++ b/components/script/dom/htmlcanvaselement.rs
@@ -191,7 +191,7 @@ impl LayoutHTMLCanvasElementHelpers for LayoutDom<'_, HTMLCanvasElement> {
 }
 
 impl HTMLCanvasElement {
-    pub(crate) fn context(&self) -> Option<Ref<RenderingContext>> {
+    pub(crate) fn context(&self) -> Option<Ref<'_, RenderingContext>> {
         Ref::filter_map(self.context_mode.borrow(), |ctx| ctx.as_ref()).ok()
     }
 
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index ad4e71fff39..8b5319d8ae2 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -766,8 +766,7 @@ impl HTMLImageElement {
     ) -> Au {
         let document = self.owner_document();
         let quirks_mode = document.quirks_mode();
-        let result = source_size_list.evaluate(document.window().layout().device(), quirks_mode);
-        result
+        source_size_list.evaluate(document.window().layout().device(), quirks_mode)
     }
 
     /// <https://html.spec.whatwg.org/multipage/#normalise-the-source-densities>
@@ -859,7 +858,7 @@ impl HTMLImageElement {
 
     fn init_image_request(
         &self,
-        request: &mut RefMut<ImageRequest>,
+        request: &mut RefMut<'_, ImageRequest>,
         url: &ServoUrl,
         src: &USVString,
         can_gc: CanGc,
@@ -1308,6 +1307,7 @@ impl HTMLImageElement {
                     // Already a part of the list of available images due to Step 14
 
                     // Step 15.5
+                    #[allow(clippy::swap_with_temporary)]
                     mem::swap(&mut this.current_request.borrow_mut(), &mut pending_request);
                 }
                 this.abort_request(State::Unavailable, ImageRequestPhase::Pending, CanGc::note());
@@ -1398,7 +1398,7 @@ impl HTMLImageElement {
 
         let value = usemap_attr.value();
 
-        if value.len() == 0 || !value.is_char_boundary(1) {
+        if value.is_empty() || !value.is_char_boundary(1) {
             return None;
         }
 
@@ -1568,7 +1568,7 @@ pub(crate) fn parse_a_sizes_attribute(value: DOMString) -> SourceSizeList {
 }
 
 fn get_correct_referrerpolicy_from_raw_token(token: &DOMString) -> DOMString {
-    if token == "" {
+    if token.is_empty() {
         // Empty token is treated as the default referrer policy inside determine_policy_for_token,
         // so it should remain unchanged.
         DOMString::new()
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index ec6e0e808e5..ae66ded7739 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -1168,7 +1168,7 @@ impl HTMLInputElement {
             }));
     }
 
-    fn text_shadow_tree(&self, can_gc: CanGc) -> Ref<InputTypeTextShadowTree> {
+    fn text_shadow_tree(&self, can_gc: CanGc) -> Ref<'_, InputTypeTextShadowTree> {
         let has_text_shadow_tree = self
             .shadow_tree
             .borrow()
@@ -1218,7 +1218,7 @@ impl HTMLInputElement {
     ///
     /// If the input is a shadow host for a different kind of shadow tree then the old
     /// tree will be removed and a new one will be created.
-    fn color_shadow_tree(&self, can_gc: CanGc) -> Ref<InputTypeColorShadowTree> {
+    fn color_shadow_tree(&self, can_gc: CanGc) -> Ref<'_, InputTypeColorShadowTree> {
         let has_color_shadow_tree = self
             .shadow_tree
             .borrow()
@@ -2510,7 +2510,7 @@ impl HTMLInputElement {
     }
 
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    fn selection(&self) -> TextControlSelection<Self> {
+    fn selection(&self) -> TextControlSelection<'_, Self> {
         TextControlSelection::new(self, &self.textinput)
     }
 
diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs
index f5503d895f2..8917b8c92bf 100644
--- a/components/script/dom/htmlscriptelement.rs
+++ b/components/script/dom/htmlscriptelement.rs
@@ -1211,7 +1211,7 @@ impl HTMLScriptElement {
         let type_attr = element.get_attribute(&ns!(), &local_name!("type"));
         let language_attr = element.get_attribute(&ns!(), &local_name!("language"));
 
-        let script_type = match (
+        match (
             type_attr.as_ref().map(|t| t.value()),
             language_attr.as_ref().map(|l| l.value()),
         ) {
@@ -1256,10 +1256,7 @@ impl HTMLScriptElement {
                     None
                 }
             },
-        };
-
-        // https://github.com/rust-lang/rust/issues/21114
-        script_type
+        }
     }
 
     pub(crate) fn set_parser_inserted(&self, parser_inserted: bool) {
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs
index c0b3d0bdc92..6ce581972d4 100644
--- a/components/script/dom/htmltextareaelement.rs
+++ b/components/script/dom/htmltextareaelement.rs
@@ -465,7 +465,7 @@ impl HTMLTextAreaElement {
     }
 
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
-    fn selection(&self) -> TextControlSelection<Self> {
+    fn selection(&self) -> TextControlSelection<'_, Self> {
         TextControlSelection::new(self, &self.textinput)
     }
 }
diff --git a/components/script/dom/idbdatabase.rs b/components/script/dom/idbdatabase.rs
index f0c40aaacc2..29df4d9384f 100644
--- a/components/script/dom/idbdatabase.rs
+++ b/components/script/dom/idbdatabase.rs
@@ -226,7 +226,7 @@ impl IDBDatabaseMethods<crate::DomTypeHolder> for IDBDatabase {
         if auto_increment {
             match key_path {
                 Some(StringOrStringSequence::String(path)) => {
-                    if path == "" {
+                    if path.is_empty() {
                         return Err(Error::InvalidAccess);
                     }
                 },
diff --git a/components/script/dom/imagebitmap.rs b/components/script/dom/imagebitmap.rs
index 5a0da731207..8a65e092bc3 100644
--- a/components/script/dom/imagebitmap.rs
+++ b/components/script/dom/imagebitmap.rs
@@ -63,7 +63,7 @@ impl ImageBitmap {
     }
 
     #[allow(dead_code)]
-    pub(crate) fn bitmap_data(&self) -> Ref<Option<Snapshot>> {
+    pub(crate) fn bitmap_data(&self) -> Ref<'_, Option<Snapshot>> {
         self.bitmap_data.borrow()
     }
 
diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs
index 0435c6141c8..418ed70ad6f 100644
--- a/components/script/dom/imagedata.rs
+++ b/components/script/dom/imagedata.rs
@@ -180,7 +180,7 @@ impl ImageData {
 
     /// Nothing must change the array on the JS side while the slice is live.
     #[allow(unsafe_code)]
-    pub(crate) unsafe fn get_rect(&self, rect: Rect<u32>) -> Cow<[u8]> {
+    pub(crate) unsafe fn get_rect(&self, rect: Rect<u32>) -> Cow<'_, [u8]> {
         pixels::rgba8_get_rect(unsafe { self.as_slice() }, self.get_size().to_u32(), rect)
     }
 
diff --git a/components/script/dom/mediafragmentparser.rs b/components/script/dom/mediafragmentparser.rs
index 0cd757de12c..77d90cc4804 100644
--- a/components/script/dom/mediafragmentparser.rs
+++ b/components/script/dom/mediafragmentparser.rs
@@ -204,7 +204,7 @@ impl From<&ServoUrl> for MediaFragmentParser {
 }
 
 // 5.1.1 Processing name-value components.
-fn decode_octets(bytes: &[u8]) -> Vec<(Cow<str>, Cow<str>)> {
+fn decode_octets(bytes: &[u8]) -> Vec<(Cow<'_, str>, Cow<'_, str>)> {
     form_urlencoded::parse(bytes)
         .filter(|(key, _)| matches!(key.as_bytes(), b"t" | b"track" | b"id" | b"xywh"))
         .collect()
diff --git a/components/script/dom/mediastream.rs b/components/script/dom/mediastream.rs
index 2bd43b1e2c0..cc673077a95 100644
--- a/components/script/dom/mediastream.rs
+++ b/components/script/dom/mediastream.rs
@@ -62,7 +62,7 @@ impl MediaStream {
         this
     }
 
-    pub(crate) fn get_tracks(&self) -> Ref<[Dom<MediaStreamTrack>]> {
+    pub(crate) fn get_tracks(&self) -> Ref<'_, [Dom<MediaStreamTrack>]> {
         Ref::map(self.tracks.borrow(), |tracks| &**tracks)
     }
 
diff --git a/components/script/dom/mutationobserver.rs b/components/script/dom/mutationobserver.rs
index 473698d5df1..2501f50e0b7 100644
--- a/components/script/dom/mutationobserver.rs
+++ b/components/script/dom/mutationobserver.rs
@@ -358,9 +358,7 @@ impl MutationObserverMethods<crate::DomTypeHolder> for MutationObserver {
         let add_new_observer = {
             let mut replaced = false;
             for registered in &mut *target.registered_mutation_observers_mut() {
-                if &*registered.observer as *const MutationObserver !=
-                    self as *const MutationObserver
-                {
+                if !std::ptr::eq(&*registered.observer, self) {
                     continue;
                 }
                 // TODO: remove matching transient registered observers
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index a55d87d4077..4694639ec4f 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -596,11 +596,11 @@ impl Iterator for QuerySelectorIterator {
 }
 
 impl Node {
-    fn rare_data(&self) -> Ref<Option<Box<NodeRareData>>> {
+    fn rare_data(&self) -> Ref<'_, Option<Box<NodeRareData>>> {
         self.rare_data.borrow()
     }
 
-    fn ensure_rare_data(&self) -> RefMut<Box<NodeRareData>> {
+    fn ensure_rare_data(&self) -> RefMut<'_, Box<NodeRareData>> {
         let mut rare_data = self.rare_data.borrow_mut();
         if rare_data.is_none() {
             *rare_data = Some(Default::default());
@@ -621,14 +621,14 @@ impl Node {
 
     /// Return all registered mutation observers for this node. Lazily initialize the
     /// raredata if it does not exist.
-    pub(crate) fn registered_mutation_observers_mut(&self) -> RefMut<Vec<RegisteredObserver>> {
+    pub(crate) fn registered_mutation_observers_mut(&self) -> RefMut<'_, Vec<RegisteredObserver>> {
         RefMut::map(self.ensure_rare_data(), |rare_data| {
             &mut rare_data.mutation_observers
         })
     }
 
-    pub(crate) fn registered_mutation_observers(&self) -> Option<Ref<Vec<RegisteredObserver>>> {
-        let rare_data: Ref<_> = self.rare_data.borrow();
+    pub(crate) fn registered_mutation_observers(&self) -> Option<Ref<'_, Vec<RegisteredObserver>>> {
+        let rare_data: Ref<'_, _> = self.rare_data.borrow();
 
         if rare_data.is_none() {
             return None;
@@ -745,7 +745,7 @@ impl Node {
         self.children_count.get()
     }
 
-    pub(crate) fn ranges(&self) -> RefMut<WeakRangeVec> {
+    pub(crate) fn ranges(&self) -> RefMut<'_, WeakRangeVec> {
         RefMut::map(self.ensure_rare_data(), |rare_data| &mut rare_data.ranges)
     }
 
@@ -2693,7 +2693,7 @@ impl Node {
 
     /// <https://dom.spec.whatwg.org/multipage/#string-replace-all>
     pub(crate) fn string_replace_all(string: DOMString, parent: &Node, can_gc: CanGc) {
-        if string.len() == 0 {
+        if string.is_empty() {
             Node::replace_all(None, parent, can_gc);
         } else {
             let text = Text::new(string, &parent.owner_document(), can_gc);
diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs
index f4bd085e0e4..3d10bd64b56 100644
--- a/components/script/dom/offscreencanvas.rs
+++ b/components/script/dom/offscreencanvas.rs
@@ -101,7 +101,7 @@ impl OffscreenCanvas {
         }
     }
 
-    pub(crate) fn context(&self) -> Option<Ref<OffscreenRenderingContext>> {
+    pub(crate) fn context(&self) -> Option<Ref<'_, OffscreenRenderingContext>> {
         Ref::filter_map(self.context.borrow(), |ctx| ctx.as_ref()).ok()
     }
 
diff --git a/components/script/dom/promise.rs b/components/script/dom/promise.rs
index e4cf374e3a9..4da167dda76 100644
--- a/components/script/dom/promise.rs
+++ b/components/script/dom/promise.rs
@@ -258,7 +258,7 @@ impl Promise {
     }
 
     #[allow(unsafe_code)]
-    pub(crate) fn promise_obj(&self) -> HandleObject {
+    pub(crate) fn promise_obj(&self) -> HandleObject<'_> {
         let obj = self.reflector().get_jsobject();
         unsafe {
             assert!(IsPromiseObject(obj));
diff --git a/components/script/dom/readablebytestreamcontroller.rs b/components/script/dom/readablebytestreamcontroller.rs
index fddde74224f..c339a77ad70 100644
--- a/components/script/dom/readablebytestreamcontroller.rs
+++ b/components/script/dom/readablebytestreamcontroller.rs
@@ -1486,10 +1486,8 @@ impl ReadableByteStreamController {
 
         // Let descriptor be controller.[[pendingPullIntos]][0].
         // Remove descriptor from controller.[[pendingPullIntos]].
-        let descriptor = self.pending_pull_intos.borrow_mut().remove(0);
-
         // Return descriptor.
-        descriptor
+        self.pending_pull_intos.borrow_mut().remove(0)
     }
 
     /// <https://streams.spec.whatwg.org/#abstract-opdef-readablebytestreamcontrollerprocessreadrequestsusingqueue>
diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index 2758f1a71bb..6f4f1bf01d6 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -185,7 +185,10 @@ impl WorkerEventLoopMethods for ServiceWorkerGlobalScope {
         self.handle_mixed_message(event, can_gc)
     }
 
-    fn handle_worker_post_event(&self, _worker: &TrustedWorkerAddress) -> Option<AutoWorkerReset> {
+    fn handle_worker_post_event(
+        &self,
+        _worker: &TrustedWorkerAddress,
+    ) -> Option<AutoWorkerReset<'_>> {
         None
     }
 
diff --git a/components/script/dom/staticrange.rs b/components/script/dom/staticrange.rs
index fef76ea1c2e..fbf6f4ed7f7 100644
--- a/components/script/dom/staticrange.rs
+++ b/components/script/dom/staticrange.rs
@@ -55,7 +55,7 @@ impl StaticRange {
         init: &StaticRangeInit,
         can_gc: CanGc,
     ) -> DomRoot<StaticRange> {
-        let staticrange = reflect_dom_object_with_proto(
+        reflect_dom_object_with_proto(
             Box::new(StaticRange::new_inherited(
                 &init.startContainer,
                 init.startOffset,
@@ -65,8 +65,7 @@ impl StaticRange {
             document.window(),
             proto,
             can_gc,
-        );
-        staticrange
+        )
     }
 }
 
diff --git a/components/script/dom/subtlecrypto.rs b/components/script/dom/subtlecrypto.rs
index a0211819a19..4b89482186d 100644
--- a/components/script/dom/subtlecrypto.rs
+++ b/components/script/dom/subtlecrypto.rs
@@ -1092,6 +1092,7 @@ impl SubtleCryptoMethods<crate::DomTypeHolder> for SubtleCrypto {
 // These "subtle" structs are proxies for the codegen'd dicts which don't hold a DOMString
 // so they can be sent safely when running steps in parallel.
 
+#[allow(dead_code)]
 #[derive(Clone, Debug)]
 pub(crate) struct SubtleAlgorithm {
     #[allow(dead_code)]
diff --git a/components/script/dom/transformstream.rs b/components/script/dom/transformstream.rs
index 4ee0af02cd0..5865c3d88fb 100644
--- a/components/script/dom/transformstream.rs
+++ b/components/script/dom/transformstream.rs
@@ -1049,8 +1049,7 @@ impl TransformStreamMethods<crate::DomTypeHolder> for TransformStream {
                 }
             };
             let promise = if is_promise {
-                let promise = Promise::new_with_js_promise(result_object.handle(), cx);
-                promise
+                Promise::new_with_js_promise(result_object.handle(), cx)
             } else {
                 Promise::new_resolved(global, cx, result.get(), can_gc)
             };
diff --git a/components/script/dom/underlyingsourcecontainer.rs b/components/script/dom/underlyingsourcecontainer.rs
index dd4b867df45..524168431fc 100644
--- a/components/script/dom/underlyingsourcecontainer.rs
+++ b/components/script/dom/underlyingsourcecontainer.rs
@@ -260,8 +260,7 @@ impl UnderlyingSourceContainer {
                         }
                     };
                     let promise = if is_promise {
-                        let promise = Promise::new_with_js_promise(result_object.handle(), cx);
-                        promise
+                        Promise::new_with_js_promise(result_object.handle(), cx)
                     } else {
                         let promise = Promise::new(&self.global(), can_gc);
                         promise.resolve_native(&result.get(), can_gc);
diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs
index 6ce9825947e..f78103f2000 100755
--- a/components/script/dom/validitystate.rs
+++ b/components/script/dom/validitystate.rs
@@ -100,7 +100,7 @@ impl ValidityState {
     }
 
     // https://html.spec.whatwg.org/multipage/#custom-validity-error-message
-    pub(crate) fn custom_error_message(&self) -> Ref<DOMString> {
+    pub(crate) fn custom_error_message(&self) -> Ref<'_, DOMString> {
         self.custom_error_message.borrow()
     }
 
diff --git a/components/script/dom/vertexarrayobject.rs b/components/script/dom/vertexarrayobject.rs
index 27f65bde7ee..df1792668c0 100644
--- a/components/script/dom/vertexarrayobject.rs
+++ b/components/script/dom/vertexarrayobject.rs
@@ -82,7 +82,7 @@ impl VertexArrayObject {
         &self.element_array_buffer
     }
 
-    pub(crate) fn get_vertex_attrib(&self, index: u32) -> Option<Ref<VertexAttribData>> {
+    pub(crate) fn get_vertex_attrib(&self, index: u32) -> Option<Ref<'_, VertexAttribData>> {
         Ref::filter_map(self.vertex_attribs.borrow(), |attribs| {
             attribs.get(index as usize)
         })
diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs
index db3d7dc5223..9298783c8bd 100644
--- a/components/script/dom/webgl2renderingcontext.rs
+++ b/components/script/dom/webgl2renderingcontext.rs
@@ -355,7 +355,7 @@ impl WebGL2RenderingContext {
         &self,
         pixel_type: u32,
         format: u32,
-    ) -> WebGLResult<ReadPixelsAllowedFormats> {
+    ) -> WebGLResult<ReadPixelsAllowedFormats<'_>> {
         let array_types = match pixel_type {
             constants::BYTE => &[Type::Int8][..],
             constants::SHORT => &[Type::Int16][..],
diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl_extensions/extensions.rs
index 35322ec0808..2874de4cd13 100644
--- a/components/script/dom/webgl_extensions/extensions.rs
+++ b/components/script/dom/webgl_extensions/extensions.rs
@@ -196,7 +196,7 @@ impl WebGLExtensions {
     where
         F: FnOnce() -> String,
     {
-        if self.extensions.borrow().len() == 0 {
+        if self.extensions.borrow().is_empty() {
             let gl_str = cb();
             self.features.borrow_mut().gl_extensions =
                 FnvHashSet::from_iter(gl_str.split(&[',', ' '][..]).map(|s| s.into()));
diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webglprogram.rs
index 8806dc5d404..c28be8a75dc 100644
--- a/components/script/dom/webglprogram.rs
+++ b/components/script/dom/webglprogram.rs
@@ -220,15 +220,15 @@ impl WebGLProgram {
         Ok(())
     }
 
-    pub(crate) fn active_attribs(&self) -> Ref<[ActiveAttribInfo]> {
+    pub(crate) fn active_attribs(&self) -> Ref<'_, [ActiveAttribInfo]> {
         Ref::map(self.active_attribs.borrow(), |attribs| &**attribs)
     }
 
-    pub(crate) fn active_uniforms(&self) -> Ref<[ActiveUniformInfo]> {
+    pub(crate) fn active_uniforms(&self) -> Ref<'_, [ActiveUniformInfo]> {
         Ref::map(self.active_uniforms.borrow(), |uniforms| &**uniforms)
     }
 
-    pub(crate) fn active_uniform_blocks(&self) -> Ref<[ActiveUniformBlockInfo]> {
+    pub(crate) fn active_uniform_blocks(&self) -> Ref<'_, [ActiveUniformBlockInfo]> {
         Ref::map(self.active_uniform_blocks.borrow(), |blocks| &**blocks)
     }
 
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index 5702737ae1d..752b0511b11 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -350,7 +350,7 @@ impl WebGLRenderingContext {
         })
     }
 
-    pub(crate) fn current_vertex_attribs(&self) -> RefMut<Box<[VertexAttrib]>> {
+    pub(crate) fn current_vertex_attribs(&self) -> RefMut<'_, Box<[VertexAttrib]>> {
         self.current_vertex_attribs.borrow_mut()
     }
 
@@ -3581,7 +3581,7 @@ impl WebGLRenderingContextMethods<crate::DomTypeHolder> for WebGLRenderingContex
         param: u32,
         mut retval: MutableHandleValue,
     ) {
-        let mut get_attrib = |data: Ref<VertexAttribData>| {
+        let mut get_attrib = |data: Ref<'_, VertexAttribData>| {
             if param == constants::CURRENT_VERTEX_ATTRIB {
                 let attrib = self.current_vertex_attribs.borrow()[index as usize];
                 match attrib {
diff --git a/components/script/dom/webglvertexarrayobject.rs b/components/script/dom/webglvertexarrayobject.rs
index 6519e7467c9..37deda8c5c0 100644
--- a/components/script/dom/webglvertexarrayobject.rs
+++ b/components/script/dom/webglvertexarrayobject.rs
@@ -64,7 +64,7 @@ impl WebGLVertexArrayObject {
         self.array_object.element_array_buffer()
     }
 
-    pub(crate) fn get_vertex_attrib(&self, index: u32) -> Option<Ref<VertexAttribData>> {
+    pub(crate) fn get_vertex_attrib(&self, index: u32) -> Option<Ref<'_, VertexAttribData>> {
         self.array_object.get_vertex_attrib(index)
     }
 
diff --git a/components/script/dom/webglvertexarrayobjectoes.rs b/components/script/dom/webglvertexarrayobjectoes.rs
index 6700950f929..100315fcdf5 100644
--- a/components/script/dom/webglvertexarrayobjectoes.rs
+++ b/components/script/dom/webglvertexarrayobjectoes.rs
@@ -64,7 +64,7 @@ impl WebGLVertexArrayObjectOES {
         self.array_object.element_array_buffer()
     }
 
-    pub(crate) fn get_vertex_attrib(&self, index: u32) -> Option<Ref<VertexAttribData>> {
+    pub(crate) fn get_vertex_attrib(&self, index: u32) -> Option<Ref<'_, VertexAttribData>> {
         self.array_object.get_vertex_attrib(index)
     }
 
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index c5788f2b4a1..adb401ff241 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -429,11 +429,11 @@ impl Window {
         self.upcast::<GlobalScope>()
     }
 
-    pub(crate) fn layout(&self) -> Ref<Box<dyn Layout>> {
+    pub(crate) fn layout(&self) -> Ref<'_, Box<dyn Layout>> {
         self.layout.borrow()
     }
 
-    pub(crate) fn layout_mut(&self) -> RefMut<Box<dyn Layout>> {
+    pub(crate) fn layout_mut(&self) -> RefMut<'_, Box<dyn Layout>> {
         self.layout.borrow_mut()
     }
 
@@ -489,7 +489,7 @@ impl Window {
         unsafe { JSContext::from_ptr(self.js_runtime.borrow().as_ref().unwrap().cx()) }
     }
 
-    pub(crate) fn get_js_runtime(&self) -> Ref<Option<Rc<Runtime>>> {
+    pub(crate) fn get_js_runtime(&self) -> Ref<'_, Option<Rc<Runtime>>> {
         self.js_runtime.borrow()
     }
 
@@ -741,7 +741,7 @@ pub(crate) fn base64_btoa(input: DOMString) -> Fallible<DOMString> {
 pub(crate) fn base64_atob(input: DOMString) -> Fallible<DOMString> {
     // "Remove all space characters from input."
     fn is_html_space(c: char) -> bool {
-        HTML_SPACE_CHARACTERS.iter().any(|&m| m == c)
+        HTML_SPACE_CHARACTERS.contains(&c)
     }
     let without_spaces = input
         .chars()
@@ -1177,7 +1177,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
         options: &ImageBitmapOptions,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        let p = ImageBitmap::create_image_bitmap(
+        ImageBitmap::create_image_bitmap(
             self.as_global_scope(),
             image,
             0,
@@ -1186,8 +1186,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
             None,
             options,
             can_gc,
-        );
-        p
+        )
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-createimagebitmap>
@@ -1201,7 +1200,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
         options: &ImageBitmapOptions,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        let p = ImageBitmap::create_image_bitmap(
+        ImageBitmap::create_image_bitmap(
             self.as_global_scope(),
             image,
             sx,
@@ -1210,8 +1209,7 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
             Some(sh),
             options,
             can_gc,
-        );
-        p
+        )
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-window
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index fb4e044b2d3..178b1166c97 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -82,7 +82,7 @@ pub(crate) fn prepare_workerscope_init(
     devtools_sender: Option<IpcSender<DevtoolScriptControlMsg>>,
     worker_id: Option<WorkerId>,
 ) -> WorkerGlobalScopeInit {
-    let init = WorkerGlobalScopeInit {
+    WorkerGlobalScopeInit {
         resource_threads: global.resource_threads().clone(),
         mem_profiler_chan: global.mem_profiler_chan().clone(),
         to_devtools_sender: global.devtools_chan().cloned(),
@@ -94,9 +94,7 @@ pub(crate) fn prepare_workerscope_init(
         origin: global.origin().immutable().clone(),
         creation_url: global.creation_url().clone(),
         inherited_secure_context: Some(global.is_secure_context()),
-    };
-
-    init
+    }
 }
 
 // https://html.spec.whatwg.org/multipage/#the-workerglobalscope-common-interface
@@ -254,7 +252,7 @@ impl WorkerGlobalScope {
         self.closing.load(Ordering::SeqCst)
     }
 
-    pub(crate) fn get_url(&self) -> Ref<ServoUrl> {
+    pub(crate) fn get_url(&self) -> Ref<'_, ServoUrl> {
         self.worker_url.borrow()
     }
 
@@ -270,7 +268,7 @@ impl WorkerGlobalScope {
         self.globalscope.pipeline_id()
     }
 
-    pub(crate) fn policy_container(&self) -> Ref<PolicyContainer> {
+    pub(crate) fn policy_container(&self) -> Ref<'_, PolicyContainer> {
         self.policy_container.borrow()
     }
 
@@ -332,7 +330,7 @@ impl WorkerGlobalScope {
     }
 
     /// Get a mutable reference to the [`TimerScheduler`] for this [`ServiceWorkerGlobalScope`].
-    pub(crate) fn timer_scheduler(&self) -> RefMut<TimerScheduler> {
+    pub(crate) fn timer_scheduler(&self) -> RefMut<'_, TimerScheduler> {
         self.timer_scheduler.borrow_mut()
     }
 
@@ -560,17 +558,7 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
         options: &ImageBitmapOptions,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        let p = ImageBitmap::create_image_bitmap(
-            self.upcast(),
-            image,
-            0,
-            0,
-            None,
-            None,
-            options,
-            can_gc,
-        );
-        p
+        ImageBitmap::create_image_bitmap(self.upcast(), image, 0, 0, None, None, options, can_gc)
     }
 
     /// <https://html.spec.whatwg.org/multipage/#dom-createimagebitmap>
@@ -584,7 +572,7 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
         options: &ImageBitmapOptions,
         can_gc: CanGc,
     ) -> Rc<Promise> {
-        let p = ImageBitmap::create_image_bitmap(
+        ImageBitmap::create_image_bitmap(
             self.upcast(),
             image,
             sx,
@@ -593,8 +581,7 @@ impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope {
             Some(sh),
             options,
             can_gc,
-        );
-        p
+        )
     }
 
     #[cfg_attr(crown, allow(crown::unrooted_must_root))]
diff --git a/components/script/dom/writablestream.rs b/components/script/dom/writablestream.rs
index 0776fa23fa2..8c953463c14 100644
--- a/components/script/dom/writablestream.rs
+++ b/components/script/dom/writablestream.rs
@@ -841,22 +841,24 @@ impl WritableStream {
 
         // Let writer be stream.[[writer]].
         let writer = self.get_writer();
-        if writer.is_some() && backpressure != self.get_backpressure() {
+
+        if let Some(writer) = writer {
             // If writer is not undefined
-            let writer = writer.expect("Writer is some, as per the above check.");
-            // and backpressure is not stream.[[backpressure]],
-            if backpressure {
-                // If backpressure is true, set writer.[[readyPromise]] to a new promise.
-                let promise = Promise::new(global, can_gc);
-                writer.set_ready_promise(promise);
-            } else {
-                // Otherwise,
-                // Assert: backpressure is false.
-                assert!(!backpressure);
-                // Resolve writer.[[readyPromise]] with undefined.
-                writer.resolve_ready_promise_with_undefined(can_gc);
+            if backpressure != self.get_backpressure() {
+                // and backpressure is not stream.[[backpressure]],
+                if backpressure {
+                    // If backpressure is true, set writer.[[readyPromise]] to a new promise.
+                    let promise = Promise::new(global, can_gc);
+                    writer.set_ready_promise(promise);
+                } else {
+                    // Otherwise,
+                    // Assert: backpressure is false.
+                    assert!(!backpressure);
+                    // Resolve writer.[[readyPromise]] with undefined.
+                    writer.resolve_ready_promise_with_undefined(can_gc);
+                }
             }
-        };
+        }
 
         // Set stream.[[backpressure]] to backpressure.
         self.set_backpressure(backpressure);
diff --git a/components/script/dom/writablestreamdefaultcontroller.rs b/components/script/dom/writablestreamdefaultcontroller.rs
index 0cf11ebeac2..95bfe088811 100644
--- a/components/script/dom/writablestreamdefaultcontroller.rs
+++ b/components/script/dom/writablestreamdefaultcontroller.rs
@@ -564,8 +564,7 @@ impl WritableStreamDefaultController {
                         }
                     };
                     if is_promise {
-                        let promise = Promise::new_with_js_promise(result_object.handle(), cx);
-                        promise
+                        Promise::new_with_js_promise(result_object.handle(), cx)
                     } else {
                         Promise::new_resolved(global, cx, result.get(), can_gc)
                     }
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index e54fce128cc..86131fa502f 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -1449,7 +1449,7 @@ impl XMLHttpRequest {
         // Step 2
         let bytes = self.response.borrow();
         // Step 3
-        if bytes.len() == 0 {
+        if bytes.is_empty() {
             return rval.set(NullValue());
         }
         // Step 4
@@ -1513,10 +1513,7 @@ impl XMLHttpRequest {
         let doc = win.Document();
         let docloader = DocumentLoader::new(&doc.loader());
         let base = wr.get_url();
-        let parsed_url = match base.join(&self.ResponseURL().0) {
-            Ok(parsed) => Some(parsed),
-            Err(_) => None, // Step 7
-        };
+        let parsed_url = base.join(&self.ResponseURL().0).ok();
         let content_type = Some(self.final_mime_type());
         Document::new(
             win,
diff --git a/components/script/indexed_db.rs b/components/script/indexed_db.rs
index 044a8f72a2b..3725475a182 100644
--- a/components/script/indexed_db.rs
+++ b/components/script/indexed_db.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use std::iter::repeat;
+use std::iter::repeat_n;
 use std::ptr;
 
 use ipc_channel::ipc::IpcSender;
@@ -56,7 +56,7 @@ pub fn key_type_to_jsval(
             result.set(UndefinedValue());
         },
         IndexedDBKeyType::Array(a) => {
-            rooted_vec!(let mut values <- repeat(UndefinedValue()).take(a.len()));
+            rooted_vec!(let mut values <- repeat_n(UndefinedValue(), a.len()));
             for (key, value) in a.iter().zip(unsafe {
                 values
                     .iter_mut()
diff --git a/components/script/layout_dom/document.rs b/components/script/layout_dom/document.rs
index 9db7d420444..82cbbb15321 100644
--- a/components/script/layout_dom/document.rs
+++ b/components/script/layout_dom/document.rs
@@ -53,7 +53,7 @@ impl<'ld> ServoLayoutDocument<'ld> {
         self.document.style_shared_lock()
     }
 
-    pub fn shadow_roots(&self) -> Vec<ServoShadowRoot> {
+    pub fn shadow_roots(&self) -> Vec<ServoShadowRoot<'_>> {
         unsafe {
             self.document
                 .shadow_roots()
diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs
index e9c6bb16b4c..6f1059af15d 100644
--- a/components/script/layout_dom/element.rs
+++ b/components/script/layout_dom/element.rs
@@ -249,7 +249,7 @@ impl<'dom> style::dom::TElement for ServoLayoutElement<'dom> {
             .is_some()
     }
 
-    fn style_attribute(&self) -> Option<ArcBorrow<StyleLocked<PropertyDeclarationBlock>>> {
+    fn style_attribute(&self) -> Option<ArcBorrow<'_, StyleLocked<PropertyDeclarationBlock>>> {
         unsafe {
             (*self.element.style_attribute())
                 .as_ref()
@@ -421,7 +421,7 @@ impl<'dom> style::dom::TElement for ServoLayoutElement<'dom> {
         unsafe { self.as_node().get_jsmanaged().clear_style_and_layout_data() }
     }
 
-    unsafe fn ensure_data(&self) -> AtomicRefMut<ElementData> {
+    unsafe fn ensure_data(&self) -> AtomicRefMut<'_, ElementData> {
         unsafe {
             self.as_node().get_jsmanaged().initialize_style_data();
         };
@@ -434,12 +434,12 @@ impl<'dom> style::dom::TElement for ServoLayoutElement<'dom> {
     }
 
     /// Immutably borrows the ElementData.
-    fn borrow_data(&self) -> Option<AtomicRef<ElementData>> {
+    fn borrow_data(&self) -> Option<AtomicRef<'_, ElementData>> {
         self.get_style_data().map(|data| data.element_data.borrow())
     }
 
     /// Mutably borrows the ElementData.
-    fn mutate_data(&self) -> Option<AtomicRefMut<ElementData>> {
+    fn mutate_data(&self) -> Option<AtomicRefMut<'_, ElementData>> {
         self.get_style_data()
             .map(|data| data.element_data.borrow_mut())
     }
@@ -1063,7 +1063,7 @@ impl<'dom> ThreadSafeLayoutElement<'dom> for ServoThreadSafeLayoutElement<'dom>
         self.element.get_attr(namespace, name)
     }
 
-    fn style_data(&self) -> AtomicRef<ElementData> {
+    fn style_data(&self) -> AtomicRef<'_, ElementData> {
         self.element.borrow_data().expect("Unstyled layout node?")
     }
 
diff --git a/components/script/messaging.rs b/components/script/messaging.rs
index d15a66886ba..d93aa2f4649 100644
--- a/components/script/messaging.rs
+++ b/components/script/messaging.rs
@@ -37,6 +37,7 @@ use crate::task::TaskBox;
 use crate::task_queue::{QueuedTask, QueuedTaskConversion, TaskQueue};
 use crate::task_source::TaskSourceName;
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub(crate) enum MixedMessage {
     FromConstellation(ScriptThreadMessage),
diff --git a/components/script/script_module.rs b/components/script/script_module.rs
index db813b92e1c..b83f2b60e6f 100644
--- a/components/script/script_module.rs
+++ b/components/script/script_module.rs
@@ -105,7 +105,7 @@ impl ModuleObject {
 pub(crate) struct RethrowError(RootedTraceableBox<Heap<JSVal>>);
 
 impl RethrowError {
-    fn handle(&self) -> Handle<JSVal> {
+    fn handle(&self) -> Handle<'_, JSVal> {
         self.0.handle()
     }
 }
diff --git a/components/script/script_runtime.rs b/components/script/script_runtime.rs
index ca6c22e5aff..19b081f4d5b 100644
--- a/components/script/script_runtime.rs
+++ b/components/script/script_runtime.rs
@@ -543,7 +543,7 @@ pub(crate) fn notify_about_rejected_promises(global: &GlobalScope) {
     let cx = GlobalScope::get_cx();
     unsafe {
         // Step 2.
-        if global.get_uncaught_rejections().borrow().len() > 0 {
+        if !global.get_uncaught_rejections().borrow().is_empty() {
             // Step 1.
             let uncaught_rejections: Vec<TrustedPromise> = global
                 .get_uncaught_rejections()
diff --git a/components/script/task_manager.rs b/components/script/task_manager.rs
index 2c012416165..7535f3a8bc8 100644
--- a/components/script/task_manager.rs
+++ b/components/script/task_manager.rs
@@ -65,7 +65,7 @@ impl TaskCancellers {
 
 macro_rules! task_source_functions {
     ($self:ident, $task_source:ident, $task_source_name:ident) => {
-        pub(crate) fn $task_source(&$self) -> TaskSource {
+        pub(crate) fn $task_source(&$self) -> TaskSource<'_> {
             TaskSource {
                 task_manager: $self,
                 name: TaskSourceName::$task_source_name,
@@ -105,7 +105,7 @@ impl TaskManager {
         self.pipeline_id
     }
 
-    pub(crate) fn sender(&self) -> Ref<Option<ScriptEventLoopSender>> {
+    pub(crate) fn sender(&self) -> Ref<'_, Option<ScriptEventLoopSender>> {
         self.sender.borrow()
     }
 
diff --git a/components/script/webdriver_handlers.rs b/components/script/webdriver_handlers.rs
index c4ee5523970..4b33aeab5df 100644
--- a/components/script/webdriver_handlers.rs
+++ b/components/script/webdriver_handlers.rs
@@ -1974,11 +1974,9 @@ fn is_element_in_view(element: &Element, paint_tree: &[DomRoot<Element>]) -> boo
     // https://w3c.github.io/webdriver/#dfn-pointer-events-are-not-disabled
     // An element is said to have pointer events disabled
     // if the resolved value of its "pointer-events" style property is "none".
-    let pointer_events_not_disabled = element
+    element
         .style()
-        .is_none_or(|style| style.get_inherited_ui().pointer_events != PointerEvents::None);
-
-    pointer_events_not_disabled
+        .is_none_or(|style| style.get_inherited_ui().pointer_events != PointerEvents::None)
 }
 
 /// <https://w3c.github.io/webdriver/#dfn-pointer-interactable-paint-tree>
diff --git a/components/script/xpath/context.rs b/components/script/xpath/context.rs
index ff51c92521d..8b73fb8058e 100644
--- a/components/script/xpath/context.rs
+++ b/components/script/xpath/context.rs
@@ -60,7 +60,7 @@ impl EvaluationCtx {
         }
     }
 
-    pub(crate) fn subcontext_iter_for_nodes(&self) -> EvalNodesetIter {
+    pub(crate) fn subcontext_iter_for_nodes(&self) -> EvalNodesetIter<'_> {
         let size = self.predicate_nodes.as_ref().map_or(0, |v| v.len());
         EvalNodesetIter {
             ctx: self,
diff --git a/components/script/xpath/eval_value.rs b/components/script/xpath/eval_value.rs
index 66f1b92c6d4..925a8cb7b13 100644
--- a/components/script/xpath/eval_value.rs
+++ b/components/script/xpath/eval_value.rs
@@ -62,7 +62,7 @@ impl PartialEq<Value> for Value {
             (&Value::Nodeset(ref nodes), &Value::Number(val)) |
             (&Value::Number(val), &Value::Nodeset(ref nodes)) => {
                 let numbers = num_vals(nodes);
-                numbers.iter().any(|n| *n == val)
+                numbers.contains(&val)
             },
             (&Value::Nodeset(ref nodes), &Value::String(ref val)) |
             (&Value::String(ref val), &Value::Nodeset(ref nodes)) => {
diff --git a/components/script_bindings/codegen/codegen.py b/components/script_bindings/codegen/codegen.py
index d212c20052c..53f271b0264 100644
--- a/components/script_bindings/codegen/codegen.py
+++ b/components/script_bindings/codegen/codegen.py
@@ -8322,8 +8322,6 @@ class CallbackMember(CGNativeMember):
             jsvalIndex = f"{i} + idx"
         else:
             jsvalIndex = f"{i}"
-            if arg.optional and not arg.defaultValue:
-                argval += ".unwrap()"
 
         conversion = wrapForType(
             "argv_root.handle_mut()", result=argval,
@@ -8340,7 +8338,7 @@ class CallbackMember(CGNativeMember):
             )
         elif arg.optional and not arg.defaultValue:
             conversion = (
-                f"{CGIfWrapper(f'{arg.identifier.name}.is_some()', CGGeneric(conversion)).define()}"
+                f"{CGIfWrapper(f'let Some({arg.identifier.name}) = {arg.identifier.name}', CGGeneric(conversion)).define()}"
                 f" else if argc == {i + 1} {{\n"
                 "    // This is our current trailing argument; reduce argc\n"
                 "    argc -= 1;\n"
diff --git a/components/script_bindings/realms.rs b/components/script_bindings/realms.rs
index 3fe60d5ae5c..440fd20f359 100644
--- a/components/script_bindings/realms.rs
+++ b/components/script_bindings/realms.rs
@@ -47,11 +47,11 @@ impl<'a> From<&'a JSAutoRealm> for InRealm<'a> {
 }
 
 impl InRealm<'_> {
-    pub fn already(token: &AlreadyInRealm) -> InRealm {
+    pub fn already(token: &AlreadyInRealm) -> InRealm<'_> {
         InRealm::Already(token)
     }
 
-    pub fn entered(token: &JSAutoRealm) -> InRealm {
+    pub fn entered(token: &JSAutoRealm) -> InRealm<'_> {
         InRealm::Entered(token)
     }
 }
diff --git a/components/script_bindings/reflector.rs b/components/script_bindings/reflector.rs
index 4b91b0536fc..57f84a1f718 100644
--- a/components/script_bindings/reflector.rs
+++ b/components/script_bindings/reflector.rs
@@ -37,7 +37,7 @@ impl PartialEq for Reflector {
 impl Reflector {
     /// Get the reflector.
     #[inline]
-    pub fn get_jsobject(&self) -> HandleObject {
+    pub fn get_jsobject(&self) -> HandleObject<'_> {
         // We're rooted, so it's safe to hand out a handle to object in Heap
         unsafe { HandleObject::from_raw(self.object.handle()) }
     }
diff --git a/components/script_bindings/trace.rs b/components/script_bindings/trace.rs
index cee852f84f6..9eefb504515 100644
--- a/components/script_bindings/trace.rs
+++ b/components/script_bindings/trace.rs
@@ -354,7 +354,7 @@ where
     Heap<T>: JSTraceable + 'static,
     T: GCMethods + Copy,
 {
-    pub fn handle(&self) -> Handle<T> {
+    pub fn handle(&self) -> Handle<'_, T> {
         self.0.handle()
     }
 }
diff --git a/components/servo/proxies.rs b/components/servo/proxies.rs
index 5db701198a4..cc96daeda83 100644
--- a/components/servo/proxies.rs
+++ b/components/servo/proxies.rs
@@ -33,6 +33,7 @@ impl ConstellationProxy {
         }
     }
 
+    #[allow(clippy::result_large_err)]
     fn try_send(
         &self,
         msg: EmbedderToConstellationMessage,
diff --git a/components/shared/base/id.rs b/components/shared/base/id.rs
index 2f2debf5dec..6a27d891553 100644
--- a/components/shared/base/id.rs
+++ b/components/shared/base/id.rs
@@ -378,16 +378,14 @@ namespace_id! {OffscreenCanvasId, OffscreenCanvasIndex, "OffscreenCanvas"}
 
 // We provide ids just for unit testing.
 pub const TEST_NAMESPACE: PipelineNamespaceId = PipelineNamespaceId(1234);
-#[allow(unsafe_code)]
 pub const TEST_PIPELINE_INDEX: Index<PipelineIndex> =
-    unsafe { Index(NonZeroU32::new_unchecked(5678), PhantomData) };
+    Index(NonZeroU32::new(5678).unwrap(), PhantomData);
 pub const TEST_PIPELINE_ID: PipelineId = PipelineId {
     namespace_id: TEST_NAMESPACE,
     index: TEST_PIPELINE_INDEX,
 };
-#[allow(unsafe_code)]
 pub const TEST_BROWSING_CONTEXT_INDEX: Index<BrowsingContextIndex> =
-    unsafe { Index(NonZeroU32::new_unchecked(8765), PhantomData) };
+    Index(NonZeroU32::new(8765).unwrap(), PhantomData);
 pub const TEST_BROWSING_CONTEXT_ID: BrowsingContextId = BrowsingContextId {
     namespace_id: TEST_NAMESPACE,
     index: TEST_BROWSING_CONTEXT_INDEX,
diff --git a/components/shared/bluetooth/scanfilter.rs b/components/shared/bluetooth/scanfilter.rs
index ba79f8f563b..f6fa380b0eb 100644
--- a/components/shared/bluetooth/scanfilter.rs
+++ b/components/shared/bluetooth/scanfilter.rs
@@ -98,7 +98,7 @@ impl BluetoothScanfilterSequence {
         self.0.iter().any(BluetoothScanfilter::is_empty_or_invalid)
     }
 
-    pub fn iter(&self) -> Iter<BluetoothScanfilter> {
+    pub fn iter(&self) -> Iter<'_, BluetoothScanfilter> {
         self.0.iter()
     }
 
diff --git a/components/shared/canvas/webgl.rs b/components/shared/canvas/webgl.rs
index 7cf09468e43..ca22386e529 100644
--- a/components/shared/canvas/webgl.rs
+++ b/components/shared/canvas/webgl.rs
@@ -769,7 +769,7 @@ pub struct ActiveUniformInfo {
 }
 
 impl ActiveUniformInfo {
-    pub fn name(&self) -> Cow<str> {
+    pub fn name(&self) -> Cow<'_, str> {
         if self.size.is_some() {
             let mut name = String::from(&*self.base_name);
             name.push_str("[0]");
diff --git a/components/shared/compositing/lib.rs b/components/shared/compositing/lib.rs
index 6592276f74c..f61dbbb6711 100644
--- a/components/shared/compositing/lib.rs
+++ b/components/shared/compositing/lib.rs
@@ -350,7 +350,7 @@ impl CrossProcessCompositorApi {
 /// This trait is used to notify lock/unlock messages and get the
 /// required info that WR needs.
 pub trait WebrenderExternalImageApi {
-    fn lock(&mut self, id: u64) -> (ExternalImageSource, UntypedSize2D<i32>);
+    fn lock(&mut self, id: u64) -> (ExternalImageSource<'_>, UntypedSize2D<i32>);
     fn unlock(&mut self, id: u64);
 }
 
@@ -433,7 +433,7 @@ impl ExternalImageHandler for WebrenderExternalImageHandlers {
     /// image content.
     /// The WR client should not change the image content until the
     /// unlock() call.
-    fn lock(&mut self, key: ExternalImageId, _channel_index: u8) -> ExternalImage {
+    fn lock(&mut self, key: ExternalImageId, _channel_index: u8) -> ExternalImage<'_> {
         let external_images = self.external_images.lock().unwrap();
         let handler_type = external_images
             .get(&key)
diff --git a/components/shared/compositing/rendering_context.rs b/components/shared/compositing/rendering_context.rs
index 0596210430b..515533db2e2 100644
--- a/components/shared/compositing/rendering_context.rs
+++ b/components/shared/compositing/rendering_context.rs
@@ -466,7 +466,7 @@ impl WindowRenderingContext {
         Ok(())
     }
 
-    pub fn surfman_details(&self) -> (RefMut<Device>, RefMut<Context>) {
+    pub fn surfman_details(&self) -> (RefMut<'_, Device>, RefMut<'_, Context>) {
         (
             self.surfman_context.device.borrow_mut(),
             self.surfman_context.context.borrow_mut(),
diff --git a/components/shared/layout/wrapper_traits.rs b/components/shared/layout/wrapper_traits.rs
index d8a0fe0d6bc..bedf4201b57 100644
--- a/components/shared/layout/wrapper_traits.rs
+++ b/components/shared/layout/wrapper_traits.rs
@@ -291,7 +291,7 @@ pub trait ThreadSafeLayoutElement<'dom>:
 
     fn get_attr_enum(&self, namespace: &Namespace, name: &LocalName) -> Option<&AttrValue>;
 
-    fn style_data(&self) -> AtomicRef<ElementData>;
+    fn style_data(&self) -> AtomicRef<'_, ElementData>;
 
     fn pseudo_element_chain(&self) -> PseudoElementChain;
 
diff --git a/components/shared/webgpu/render_commands.rs b/components/shared/webgpu/render_commands.rs
index 37ba70daaca..fc606824608 100644
--- a/components/shared/webgpu/render_commands.rs
+++ b/components/shared/webgpu/render_commands.rs
@@ -70,6 +70,7 @@ pub enum RenderCommand {
     ExecuteBundles(Vec<RenderBundleId>),
 }
 
+#[allow(clippy::result_large_err)]
 pub fn apply_render_command(
     global: &Global,
     pass: &mut RenderPass,
diff --git a/components/url/lib.rs b/components/url/lib.rs
index 8296f5a79c4..93906e5cf54 100644
--- a/components/url/lib.rs
+++ b/components/url/lib.rs
@@ -178,7 +178,7 @@ impl ServoUrl {
         self.0.join(input).map(Self::from_url)
     }
 
-    pub fn path_segments(&self) -> Option<::std::str::Split<char>> {
+    pub fn path_segments(&self) -> Option<::std::str::Split<'_, char>> {
         self.0.path_segments()
     }
 
diff --git a/components/webgl/webgl_mode/inprocess.rs b/components/webgl/webgl_mode/inprocess.rs
index cc5ab7af6a4..6ed47737821 100644
--- a/components/webgl/webgl_mode/inprocess.rs
+++ b/components/webgl/webgl_mode/inprocess.rs
@@ -134,7 +134,7 @@ impl WebGLExternalImages {
 }
 
 impl WebrenderExternalImageApi for WebGLExternalImages {
-    fn lock(&mut self, id: u64) -> (ExternalImageSource, Size2D<i32>) {
+    fn lock(&mut self, id: u64) -> (ExternalImageSource<'_>, Size2D<i32>) {
         let id = WebGLContextId(id);
         let (texture_id, size) = self.lock_swap_chain(id).unwrap_or_default();
         (ExternalImageSource::NativeTexture(texture_id), size)
diff --git a/components/webgpu/poll_thread.rs b/components/webgpu/poll_thread.rs
index 83ae921aac0..958ad67d82a 100644
--- a/components/webgpu/poll_thread.rs
+++ b/components/webgpu/poll_thread.rs
@@ -116,7 +116,7 @@ impl Poller {
     }
 
     /// Lock for device maintain calls (in poll_all_devices and queue_submit)
-    pub(crate) fn lock(&self) -> MutexGuard<()> {
+    pub(crate) fn lock(&self) -> MutexGuard<'_, ()> {
         self.lock.lock().unwrap()
     }
 }
diff --git a/components/webgpu/swapchain.rs b/components/webgpu/swapchain.rs
index 712bdf7a6ef..4fb59344cdb 100644
--- a/components/webgpu/swapchain.rs
+++ b/components/webgpu/swapchain.rs
@@ -83,7 +83,7 @@ pub struct WGPUExternalImages {
 }
 
 impl WebrenderExternalImageApi for WGPUExternalImages {
-    fn lock(&mut self, id: u64) -> (ExternalImageSource, Size2D<i32>) {
+    fn lock(&mut self, id: u64) -> (ExternalImageSource<'_>, Size2D<i32>) {
         let id = WebGPUContextId(id);
         let webgpu_contexts = self.images.lock().unwrap();
         let context_data = webgpu_contexts.get(&id).unwrap();
diff --git a/components/webxr/glwindow/mod.rs b/components/webxr/glwindow/mod.rs
index c11805c70ca..d00e5529472 100644
--- a/components/webxr/glwindow/mod.rs
+++ b/components/webxr/glwindow/mod.rs
@@ -52,7 +52,7 @@ pub trait GlWindow {
     fn get_mode(&self) -> GlWindowMode {
         GlWindowMode::Blit
     }
-    fn display_handle(&self) -> DisplayHandle;
+    fn display_handle(&self) -> DisplayHandle<'_>;
 }
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
diff --git a/ports/servoshell/desktop/accelerated_gl_media.rs b/ports/servoshell/desktop/accelerated_gl_media.rs
index fe0267a5b2a..025dbcc7b80 100644
--- a/ports/servoshell/desktop/accelerated_gl_media.rs
+++ b/ports/servoshell/desktop/accelerated_gl_media.rs
@@ -10,10 +10,10 @@ use surfman::{Context, Device};
     target_os = "windows",
     all(target_os = "linux", not(target_env = "ohos"))
 )))]
-pub(crate) fn setup_gl_accelerated_media(_: RefMut<Device>, _: RefMut<Context>) {}
+pub(crate) fn setup_gl_accelerated_media(_: RefMut<'_, Device>, _: RefMut<'_, Context>) {}
 
 #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
-pub(crate) fn setup_gl_accelerated_media(device: RefMut<Device>, context: RefMut<Context>) {
+pub(crate) fn setup_gl_accelerated_media(device: RefMut<'_, Device>, context: RefMut<'_, Context>) {
     use servo::Servo;
     use servo::media::{GlContext, NativeDisplay};
     use surfman::platform::generic::multi::connection::NativeConnection;
@@ -42,7 +42,7 @@ pub(crate) fn setup_gl_accelerated_media(device: RefMut<Device>, context: RefMut
 }
 
 #[cfg(target_os = "windows")]
-pub(crate) fn setup_gl_accelerated_media(device: RefMut<Device>, context: RefMut<Context>) {
+pub(crate) fn setup_gl_accelerated_media(device: RefMut<'_, Device>, context: RefMut<'_, Context>) {
     use servo::Servo;
     use servo::media::{GlContext, NativeDisplay};
 
diff --git a/ports/servoshell/desktop/app_state.rs b/ports/servoshell/desktop/app_state.rs
index 5893f3a8ae1..99baf6ea377 100644
--- a/ports/servoshell/desktop/app_state.rs
+++ b/ports/servoshell/desktop/app_state.rs
@@ -135,11 +135,11 @@ impl RunningAppState {
         webview
     }
 
-    pub(crate) fn inner(&self) -> Ref<RunningAppStateInner> {
+    pub(crate) fn inner(&self) -> Ref<'_, RunningAppStateInner> {
         self.inner.borrow()
     }
 
-    pub(crate) fn inner_mut(&self) -> RefMut<RunningAppStateInner> {
+    pub(crate) fn inner_mut(&self) -> RefMut<'_, RunningAppStateInner> {
         self.inner.borrow_mut()
     }
 
@@ -429,11 +429,11 @@ impl RunningAppState {
                 webview.notify_scroll_event(ScrollLocation::End, origin);
             })
             .shortcut(Modifiers::empty(), Key::Named(NamedKey::ArrowUp), || {
-                let location = ScrollLocation::Delta(Vector2D::new(0.0, -1.0 * LINE_HEIGHT));
+                let location = ScrollLocation::Delta(Vector2D::new(0.0, -LINE_HEIGHT));
                 webview.notify_scroll_event(location, origin);
             })
             .shortcut(Modifiers::empty(), Key::Named(NamedKey::ArrowDown), || {
-                let location = ScrollLocation::Delta(Vector2D::new(0.0, 1.0 * LINE_HEIGHT));
+                let location = ScrollLocation::Delta(Vector2D::new(0.0, LINE_HEIGHT));
                 webview.notify_scroll_event(location, origin);
             })
             .shortcut(Modifiers::empty(), Key::Named(NamedKey::ArrowLeft), || {
diff --git a/ports/servoshell/desktop/dialog.rs b/ports/servoshell/desktop/dialog.rs
index b5ccd9081dc..a705f955df6 100644
--- a/ports/servoshell/desktop/dialog.rs
+++ b/ports/servoshell/desktop/dialog.rs
@@ -17,6 +17,7 @@ use servo::{
     SelectElementOptionOrOptgroup, SimpleDialog, WebDriverUserPrompt,
 };
 
+#[allow(clippy::large_enum_variant)]
 pub enum Dialog {
     File {
         dialog: EguiFileDialog,
diff --git a/ports/servoshell/desktop/events_loop.rs b/ports/servoshell/desktop/events_loop.rs
index 4137001e4eb..a560de34705 100644
--- a/ports/servoshell/desktop/events_loop.rs
+++ b/ports/servoshell/desktop/events_loop.rs
@@ -33,6 +33,7 @@ impl From<accesskit_winit::Event> for AppEvent {
 
 /// The real or fake OS event loop.
 #[allow(dead_code)]
+#[allow(clippy::large_enum_variant)]
 enum EventLoop {
     /// A real Winit windowing event loop.
     Winit(winit::event_loop::EventLoop<AppEvent>),
diff --git a/ports/servoshell/desktop/headed_window.rs b/ports/servoshell/desktop/headed_window.rs
index eef657f2062..ad9ce32a8a4 100644
--- a/ports/servoshell/desktop/headed_window.rs
+++ b/ports/servoshell/desktop/headed_window.rs
@@ -908,7 +908,7 @@ impl servo::webxr::glwindow::GlWindow for XRWindow {
         }
     }
 
-    fn display_handle(&self) -> raw_window_handle::DisplayHandle {
+    fn display_handle(&self) -> raw_window_handle::DisplayHandle<'_> {
         self.winit_window
             .display_handle()
             .expect("Every window should have a display handle")
diff --git a/ports/servoshell/desktop/minibrowser.rs b/ports/servoshell/desktop/minibrowser.rs
index 460e639c15b..ac8786495fd 100644
--- a/ports/servoshell/desktop/minibrowser.rs
+++ b/ports/servoshell/desktop/minibrowser.rs
@@ -176,7 +176,7 @@ impl Minibrowser {
     }
 
     /// Create a frameless button with square sizing, as used in the toolbar.
-    fn toolbar_button(text: &str) -> egui::Button {
+    fn toolbar_button(text: &str) -> egui::Button<'_> {
         egui::Button::new(text)
             .frame(false)
             .min_size(Vec2 { x: 20.0, y: 20.0 })
diff --git a/ports/servoshell/egl/app_state.rs b/ports/servoshell/egl/app_state.rs
index c6c8da94a22..8dfe3f892c6 100644
--- a/ports/servoshell/egl/app_state.rs
+++ b/ports/servoshell/egl/app_state.rs
@@ -373,11 +373,11 @@ impl RunningAppState {
         }
     }
 
-    fn inner(&self) -> Ref<RunningAppStateInner> {
+    fn inner(&self) -> Ref<'_, RunningAppStateInner> {
         self.inner.borrow()
     }
 
-    fn inner_mut(&self) -> RefMut<RunningAppStateInner> {
+    fn inner_mut(&self) -> RefMut<'_, RunningAppStateInner> {
         self.inner.borrow_mut()
     }
 
diff --git a/ports/servoshell/parser.rs b/ports/servoshell/parser.rs
index f28c6698463..c19cdc2c0e7 100644
--- a/ports/servoshell/parser.rs
+++ b/ports/servoshell/parser.rs
@@ -47,8 +47,14 @@ pub fn get_default_url(
         }
     }
 
-    if new_url.is_none() && url_opt.is_some() {
-        new_url = location_bar_input_to_url(url_opt.unwrap(), &preferences.searchpage);
+    #[allow(
+        clippy::collapsible_if,
+        reason = "let chains are not available in 1.85"
+    )]
+    if new_url.is_none() {
+        if let Some(url_opt) = url_opt {
+            new_url = location_bar_input_to_url(url_opt, &preferences.searchpage);
+        }
     }
 
     let pref_url = parse_url_or_filename(cwd.as_ref(), &preferences.homepage).ok();
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 09d8bc760c6..97ac30608ba 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -2,7 +2,7 @@
 # Be sure to update the 'rust-overlay' module's url in shell.nix to point to a
 # commit which supports the required rustc version and also update the version
 # in support/crown/rust-toolchain.toml when bumping this!
-channel = "1.85.0"
+channel = "1.89.0"
 
 components = [
     "clippy",
diff --git a/shell.nix b/shell.nix
index c6f3f6f9673..076a4a77b8c 100644
--- a/shell.nix
+++ b/shell.nix
@@ -10,7 +10,7 @@ with import (builtins.fetchTarball {
   overlays = [
     (import (builtins.fetchTarball {
       # Bumped the channel in rust-toolchain.toml? Bump this commit too!
-      url = "https://github.com/oxalica/rust-overlay/archive/7c5892ad87b90d72668964975eebd4e174ff6204.tar.gz";
+      url = "https://github.com/oxalica/rust-overlay/archive/95487740bb7ac11553445e9249041a6fa4b5eccf.tar.gz";
     }))
   ];
   config = {
diff --git a/support/crown/rust-toolchain.toml b/support/crown/rust-toolchain.toml
index 452c39d279a..e646fb4bf5b 100644
--- a/support/crown/rust-toolchain.toml
+++ b/support/crown/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.85.0"
+channel = "1.89.0"
 
 components = [
     "clippy",
diff --git a/support/crown/src/common.rs b/support/crown/src/common.rs
index 958e4b5e4d6..16d5608bfed 100644
--- a/support/crown/src/common.rs
+++ b/support/crown/src/common.rs
@@ -2,19 +2,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use rustc_ast::Mutability;
-use rustc_hir::def::{DefKind, Res};
-use rustc_hir::def_id::{CrateNum, DefId, LocalDefId, LOCAL_CRATE};
-use rustc_hir::{ImplItemRef, ItemKind, Node, OwnerId, PrimTy, TraitItemRef};
+use rustc_hir::def::DefKind;
+use rustc_hir::def_id::{CrateNum, DefId};
 use rustc_infer::infer::TyCtxtInferExt;
+use rustc_infer::traits::{EvaluationResult, Obligation, ObligationCause};
 use rustc_lint::LateContext;
-use rustc_middle::ty::fast_reject::SimplifiedType;
-use rustc_middle::ty::{self, GenericArg, Ty, TyCtxt, TypeVisitableExt, TypingEnv};
+use rustc_middle::ty::{self, GenericArg, TraitRef, Ty, TyCtxt, TypeVisitableExt};
 use rustc_span::hygiene::{ExpnKind, MacroKind};
-use rustc_span::symbol::{Ident, Symbol};
+use rustc_span::symbol::Symbol;
 use rustc_span::{Span, DUMMY_SP};
-use rustc_trait_selection::infer::InferCtxtExt;
-use rustc_type_ir::{FloatTy, IntTy, UintTy};
+use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt as _;
+use rustc_type_ir::Upcast as _;
 
 /// check if a DefId's path matches the given absolute type path
 /// usage e.g. with
@@ -65,286 +63,101 @@ macro_rules! symbols {
     }
 }
 
+pub fn find_first_crate<'tcx>(tcx: &TyCtxt<'tcx>, crate_name: Symbol) -> Option<CrateNum> {
+    tcx.crates(())
+        .iter()
+        .find(|c| tcx.crate_name(**c) == crate_name)
+        .copied()
+}
+
+pub fn trait_in_crate<'tcx>(
+    tcx: &TyCtxt<'tcx>,
+    krate: CrateNum,
+    trait_sym: Symbol,
+) -> Option<DefId> {
+    tcx.traits(krate)
+        .iter()
+        .find(|id| tcx.opt_item_name(**id) == Some(trait_sym))
+        .copied()
+}
+
 /*
 Stuff copied from clippy:
 */
 
-// This is adapted from
-// https://github.com/rust-lang/rust-clippy/blob/546408be416f0355a39601c1457b37727bc74395/clippy_utils/src/lib.rs#L517.
-fn find_primitive_impls<'tcx>(tcx: TyCtxt<'tcx>, name: &str) -> impl Iterator<Item = DefId> + 'tcx {
-    let ty = match name {
-        "bool" => SimplifiedType::Bool,
-        "char" => SimplifiedType::Char,
-        "str" => SimplifiedType::Str,
-        "array" => SimplifiedType::Array,
-        "slice" => SimplifiedType::Slice,
-        // FIXME: rustdoc documents these two using just `pointer`.
-        //
-        // Maybe this is something we should do here too.
-        "const_ptr" => SimplifiedType::Ptr(Mutability::Not),
-        "mut_ptr" => SimplifiedType::Ptr(Mutability::Mut),
-        "isize" => SimplifiedType::Int(IntTy::Isize),
-        "i8" => SimplifiedType::Int(IntTy::I8),
-        "i16" => SimplifiedType::Int(IntTy::I16),
-        "i32" => SimplifiedType::Int(IntTy::I32),
-        "i64" => SimplifiedType::Int(IntTy::I64),
-        "i128" => SimplifiedType::Int(IntTy::I128),
-        "usize" => SimplifiedType::Uint(UintTy::Usize),
-        "u8" => SimplifiedType::Uint(UintTy::U8),
-        "u16" => SimplifiedType::Uint(UintTy::U16),
-        "u32" => SimplifiedType::Uint(UintTy::U32),
-        "u64" => SimplifiedType::Uint(UintTy::U64),
-        "u128" => SimplifiedType::Uint(UintTy::U128),
-        "f32" => SimplifiedType::Float(FloatTy::F32),
-        "f64" => SimplifiedType::Float(FloatTy::F64),
-        #[allow(trivial_casts)]
-        _ => {
-            return [].iter().copied();
-        },
-    };
-
-    tcx.incoherent_impls(ty).iter().copied()
-}
-
-fn non_local_item_children_by_name(tcx: TyCtxt<'_>, def_id: DefId, name: Symbol) -> Vec<Res> {
-    match tcx.def_kind(def_id) {
-        DefKind::Mod | DefKind::Enum | DefKind::Trait => tcx
-            .module_children(def_id)
-            .iter()
-            .filter(|item| item.ident.name == name)
-            .map(|child| child.res.expect_non_local())
-            .collect(),
-        DefKind::Impl { .. } => tcx
-            .associated_item_def_ids(def_id)
-            .iter()
-            .copied()
-            .filter(|assoc_def_id| tcx.item_name(*assoc_def_id) == name)
-            .map(|assoc_def_id| Res::Def(tcx.def_kind(assoc_def_id), assoc_def_id))
-            .collect(),
-        _ => Vec::new(),
-    }
-}
-
-// This is adapted from clippy:
-// https://github.com/rust-lang/rust-clippy/blob/546408be416f0355a39601c1457b37727bc74395/clippy_utils/src/lib.rs#L574.
-fn local_item_children_by_name(tcx: TyCtxt<'_>, local_id: LocalDefId, name: Symbol) -> Vec<Res> {
-    let hir = tcx.hir();
-
-    let root_mod;
-    let item_kind = match tcx.hir_node_by_def_id(local_id) {
-        Node::Crate(r#mod) => {
-            root_mod = ItemKind::Mod(r#mod);
-            &root_mod
-        },
-        Node::Item(item) => &item.kind,
-        _ => return Vec::new(),
-    };
-
-    let res = |ident: Ident, owner_id: OwnerId| {
-        if ident.name == name {
-            let def_id = owner_id.to_def_id();
-            Some(Res::Def(tcx.def_kind(def_id), def_id))
-        } else {
-            None
-        }
-    };
-
-    match item_kind {
-        ItemKind::Mod(r#mod) => r#mod
-            .item_ids
-            .iter()
-            .filter_map(|&item_id| res(hir.item(item_id).ident, item_id.owner_id))
-            .collect(),
-        ItemKind::Impl(r#impl) => r#impl
-            .items
-            .iter()
-            .filter_map(|&ImplItemRef { ident, id, .. }| res(ident, id.owner_id))
-            .collect(),
-        ItemKind::Trait(.., trait_item_refs) => trait_item_refs
-            .iter()
-            .filter_map(|&TraitItemRef { ident, id, .. }| res(ident, id.owner_id))
-            .collect(),
-        _ => Vec::new(),
-    }
-}
-
-fn item_children_by_name(tcx: TyCtxt<'_>, def_id: DefId, name: Symbol) -> Vec<Res> {
-    if let Some(local_id) = def_id.as_local() {
-        local_item_children_by_name(tcx, local_id, name)
-    } else {
-        non_local_item_children_by_name(tcx, def_id, name)
-    }
-}
-
-/// Resolves a def path like `std::vec::Vec`.
-///
-/// Can return multiple resolutions when there are multiple versions of the same crate, e.g.
-/// `memchr::memchr` could return the functions from both memchr 1.0 and memchr 2.0.
-///
-/// Also returns multiple results when there are multiple paths under the same name e.g. `std::vec`
-/// would have both a [`DefKind::Mod`] and [`DefKind::Macro`].
-///
-/// This function is expensive and should be used sparingly.
-pub fn def_path_res(cx: &LateContext<'_>, path: &[&str]) -> Vec<Res> {
-    fn find_crates(tcx: TyCtxt<'_>, name: Symbol) -> impl Iterator<Item = DefId> + '_ {
-        tcx.crates(())
-            .iter()
-            .copied()
-            .filter(move |&num| tcx.crate_name(num) == name)
-            .map(CrateNum::as_def_id)
-    }
-
-    let tcx = cx.tcx;
-
-    let (base, mut path) = match *path {
-        [primitive] => {
-            return vec![PrimTy::from_name(Symbol::intern(primitive)).map_or(Res::Err, Res::PrimTy)];
-        },
-        [base, ref path @ ..] => (base, path),
-        _ => return Vec::new(),
-    };
-
-    let base_sym = Symbol::intern(base);
-
-    let local_crate = if tcx.crate_name(LOCAL_CRATE) == base_sym {
-        Some(LOCAL_CRATE.as_def_id())
-    } else {
-        None
-    };
-
-    let starts = find_primitive_impls(tcx, base)
-        .chain(find_crates(tcx, base_sym))
-        .chain(local_crate)
-        .map(|id| Res::Def(tcx.def_kind(id), id));
-
-    let mut resolutions: Vec<Res> = starts.collect();
-
-    while let [segment, rest @ ..] = path {
-        path = rest;
-        let segment = Symbol::intern(segment);
-
-        resolutions = resolutions
-            .into_iter()
-            .filter_map(|res| res.opt_def_id())
-            .flat_map(|def_id| {
-                // When the current def_id is e.g. `struct S`, check the impl items in
-                // `impl S { ... }`
-                let inherent_impl_children = tcx
-                    .inherent_impls(def_id)
-                    .into_iter()
-                    .flat_map(|&impl_def_id| item_children_by_name(tcx, impl_def_id, segment));
-
-                let direct_children = item_children_by_name(tcx, def_id, segment);
-
-                inherent_impl_children.chain(direct_children)
-            })
-            .collect();
-    }
-
-    resolutions
-}
-
-pub fn get_trait_def_id(cx: &LateContext<'_>, path: &[&str]) -> Option<DefId> {
-    def_path_res(cx, path)
-        .into_iter()
-        .find_map(|res| match res {
-            Res::Def(DefKind::Trait | DefKind::TraitAlias, trait_id) => Some(trait_id),
-            _ => None,
-        })
-}
-
-// These are special variants made from the above functions.
-/// Resolves a def path like `std::vec::Vec`, but searches only local crate
-///
-/// Also returns multiple results when there are multiple paths under the same name e.g. `std::vec`
-/// would have both a [`DefKind::Mod`] and [`DefKind::Macro`].
-///
-/// This function is less expensive than `def_path_res` and should be used sparingly.
-pub fn def_local_res(cx: &LateContext<'_>, path: &str) -> Vec<Res> {
-    let tcx = cx.tcx;
-    let local_crate = LOCAL_CRATE.as_def_id();
-    let starts = Res::Def(tcx.def_kind(local_crate), local_crate);
-    let mut resolutions: Vec<Res> = vec![starts];
-    let segment = Symbol::intern(path);
-
-    resolutions = resolutions
-        .into_iter()
-        .filter_map(|res| res.opt_def_id())
-        .flat_map(|def_id| {
-            // When the current def_id is e.g. `struct S`, check the impl items in
-            // `impl S { ... }`
-            let inherent_impl_children = tcx
-                .inherent_impls(def_id)
-                .into_iter()
-                .flat_map(|&impl_def_id| item_children_by_name(tcx, impl_def_id, segment));
-
-            let direct_children = item_children_by_name(tcx, def_id, segment);
-
-            inherent_impl_children.chain(direct_children)
-        })
-        .collect();
-
-    resolutions
-}
-
-pub fn get_local_trait_def_id(cx: &LateContext<'_>, path: &str) -> Option<DefId> {
-    def_local_res(cx, path)
-        .into_iter()
-        .find_map(|res| match res {
-            Res::Def(DefKind::Trait | DefKind::TraitAlias, trait_id) => Some(trait_id),
-            _ => None,
-        })
-}
-
 /// Checks whether a type implements a trait.
 /// The function returns false in case the type contains an inference variable.
 ///
-/// See:
-/// * [`get_trait_def_id`](super::get_trait_def_id) to get a trait [`DefId`].
-/// * [Common tools for writing lints] for an example how to use this function and other options.
+/// See [Common tools for writing lints] for an example how to use this function and other options.
 ///
 /// [Common tools for writing lints]: https://github.com/rust-lang/rust-clippy/blob/master/book/src/development/common_tools_writing_lints.md#checking-if-a-type-implements-a-specific-trait
 pub fn implements_trait<'tcx>(
     cx: &LateContext<'tcx>,
     ty: Ty<'tcx>,
     trait_id: DefId,
-    ty_params: &[GenericArg<'tcx>],
+    args: &[GenericArg<'tcx>],
 ) -> bool {
-    implements_trait_with_env(
+    implements_trait_with_env_from_iter(
         cx.tcx,
         cx.typing_env(),
         ty,
         trait_id,
-        ty_params.iter().map(|&arg| Some(arg)),
+        None,
+        args.iter().map(|&x| Some(x)),
     )
 }
 
-/// Same as `implements_trait` but allows using a `ParamEnv` different from the lint context.
-pub fn implements_trait_with_env<'tcx>(
+/// Same as `implements_trait_from_env` but takes the arguments as an iterator.
+pub fn implements_trait_with_env_from_iter<'tcx>(
     tcx: TyCtxt<'tcx>,
-    typing_env: TypingEnv<'tcx>,
-    ty: ty::Ty<'tcx>,
+    typing_env: ty::TypingEnv<'tcx>,
+    ty: Ty<'tcx>,
     trait_id: DefId,
-    ty_params: impl IntoIterator<Item = Option<GenericArg<'tcx>>>,
+    callee_id: Option<DefId>,
+    args: impl IntoIterator<Item = impl Into<Option<GenericArg<'tcx>>>>,
 ) -> bool {
+    // Clippy shouldn't have infer types
+    assert!(!ty.has_infer());
+
+    // If a `callee_id` is passed, then we assert that it is a body owner
+    // through calling `body_owner_kind`, which would panic if the callee
+    // does not have a body.
+    if let Some(callee_id) = callee_id {
+        let _ = tcx.hir_body_owner_kind(callee_id);
+    }
+
     let ty = tcx.erase_regions(ty);
     if ty.has_escaping_bound_vars() {
         return false;
     }
 
     let (infcx, param_env) = tcx.infer_ctxt().build_with_typing_env(typing_env);
-    let ty_params = tcx.mk_args_from_iter(
-        ty_params
-            .into_iter()
-            .map(|arg| arg.unwrap_or_else(|| infcx.next_ty_var(DUMMY_SP).into())),
+    let args = args
+        .into_iter()
+        .map(|arg| {
+            arg.into()
+                .unwrap_or_else(|| infcx.next_ty_var(DUMMY_SP).into())
+        })
+        .collect::<Vec<_>>();
+
+    let trait_ref = TraitRef::new(
+        tcx,
+        trait_id,
+        [GenericArg::from(ty)].into_iter().chain(args),
     );
+
+    debug_assert!(
+        matches!(tcx.def_kind(trait_id), DefKind::Trait | DefKind::TraitAlias),
+        "`DefId` must belong to a trait or trait alias"
+    );
+
+    let obligation = Obligation {
+        cause: ObligationCause::dummy(),
+        param_env,
+        recursion_depth: 0,
+        predicate: trait_ref.upcast(tcx),
+    };
     infcx
-        .type_implements_trait(
-            trait_id,
-            // for some unknown reason we need to have vec here
-            // clippy has array
-            vec![ty.into()].into_iter().chain(ty_params),
-            param_env,
-        )
-        .must_apply_modulo_regions()
+        .evaluate_obligation(&obligation)
+        .is_ok_and(EvaluationResult::must_apply_modulo_regions)
 }
diff --git a/support/crown/src/main.rs b/support/crown/src/main.rs
index b4d530a34ef..27d68a39a18 100644
--- a/support/crown/src/main.rs
+++ b/support/crown/src/main.rs
@@ -72,5 +72,5 @@ fn main() {
     // Pass cfg(crown) to rustc
     args.extend(["--cfg".to_owned(), "crown".to_owned()]);
 
-    rustc_driver::RunCompiler::new(&args, &mut MyCallbacks).run()
+    rustc_driver::run_compiler(&args, &mut MyCallbacks)
 }
diff --git a/support/crown/src/trace_in_no_trace.rs b/support/crown/src/trace_in_no_trace.rs
index cb64eb9d55b..170c1a45ea0 100644
--- a/support/crown/src/trace_in_no_trace.rs
+++ b/support/crown/src/trace_in_no_trace.rs
@@ -5,13 +5,14 @@
 use rustc_ast::token::TokenKind;
 use rustc_ast::tokenstream::TokenTree;
 use rustc_error_messages::MultiSpan;
+use rustc_hir::def_id::{DefId, LOCAL_CRATE};
 use rustc_hir::{self as hir};
 use rustc_lint::{LateContext, LateLintPass, Lint, LintContext, LintPass, LintStore};
 use rustc_middle::ty;
 use rustc_session::declare_tool_lint;
 use rustc_span::symbol::Symbol;
 
-use crate::common::{get_local_trait_def_id, get_trait_def_id, implements_trait};
+use crate::common::{find_first_crate, implements_trait, trait_in_crate};
 use crate::symbols;
 
 declare_tool_lint! {
@@ -67,14 +68,11 @@ fn get_must_not_have_traceable(sym: &Symbols, attrs: &[hir::Attribute]) -> Optio
     attrs
         .iter()
         .find(|attr| {
-            matches!(
-                &attr.kind,
-                hir::AttrKind::Normal(normal)
-                if normal.path.segments.len() == 3 &&
-                normal.path.segments[0].name == sym.crown &&
-                normal.path.segments[1].name == sym.trace_in_no_trace_lint &&
-                normal.path.segments[2].name == sym.must_not_have_traceable
-            )
+            attr.path_matches(&[
+                sym.crown,
+                sym.trace_in_no_trace_lint,
+                sym.must_not_have_traceable,
+            ])
         })
         .map(|x| match &x.get_normal_item().args {
             hir::AttrArgs::Empty => 0,
@@ -98,13 +96,17 @@ fn get_must_not_have_traceable(sym: &Symbols, attrs: &[hir::Attribute]) -> Optio
         })
 }
 
-fn is_jstraceable<'tcx>(cx: &LateContext<'tcx>, ty: ty::Ty<'tcx>) -> bool {
-    // TODO(sagudev): get_trait_def_id is expensive, use lazy and cache it for whole pass
-    if let Some(trait_id) = get_trait_def_id(cx, &["mozjs", "gc", "Traceable"]) {
-        return implements_trait(cx, ty, trait_id, &[]);
+fn find_jstraceable<'tcx>(cx: &LateContext<'tcx>) -> Option<DefId> {
+    // mozjs_sys::trace::Traceable
+    if let Some(mozjs) = find_first_crate(&cx.tcx, Symbol::intern("mozjs_sys")) {
+        return trait_in_crate(&cx.tcx, mozjs, Symbol::intern("Traceable"));
     }
     // when running tests
-    if let Some(trait_id) = get_local_trait_def_id(cx, "JSTraceable") {
+    trait_in_crate(&cx.tcx, LOCAL_CRATE, Symbol::intern("JSTraceable"))
+}
+
+fn is_jstraceable<'tcx>(cx: &LateContext<'tcx>, ty: ty::Ty<'tcx>) -> bool {
+    if let Some(trait_id) = find_jstraceable(cx) {
         return implements_trait(cx, ty, trait_id, &[]);
     }
     panic!("JSTraceable not found");
@@ -119,7 +121,7 @@ fn incorrect_no_trace<'tcx, I: Into<MultiSpan> + Copy>(
 ) {
     let mut walker = ty.walk();
     while let Some(generic_arg) = walker.next() {
-        let t = match generic_arg.unpack() {
+        let t = match generic_arg.kind() {
             rustc_middle::ty::GenericArgKind::Type(t) => t,
             _ => {
                 walker.skip_current_subtree();
@@ -168,8 +170,8 @@ impl<'tcx> LateLintPass<'tcx> for NotracePass {
         if has_lint_attr(&self.symbols, &attrs, self.symbols.must_root) {
             return;
         }*/
-        if let hir::ItemKind::Struct(def, ..) = &item.kind {
-            for field in def.fields() {
+        if let hir::ItemKind::Struct(_, _, variant_data) = &item.kind {
+            for field in variant_data.fields() {
                 let field_type = cx.tcx.type_of(field.def_id);
                 incorrect_no_trace(&self.symbols, cx, field_type.skip_binder(), field.span);
             }
diff --git a/support/crown/src/unrooted_must_root.rs b/support/crown/src/unrooted_must_root.rs
index b954ad66043..94f07ef4f93 100644
--- a/support/crown/src/unrooted_must_root.rs
+++ b/support/crown/src/unrooted_must_root.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-use rustc_hir::{self as hir, intravisit as visit, ExprKind};
+use rustc_hir::{self as hir, intravisit as visit, AmbigArg, ExprKind};
 use rustc_lint::{LateContext, LateLintPass, Lint, LintContext, LintPass, LintStore};
 use rustc_middle::ty;
 use rustc_session::declare_tool_lint;
@@ -61,7 +61,7 @@ fn associated_type_has_attr<'tcx>(
 ) -> bool {
     let mut walker = ty.walk();
     while let Some(generic_arg) = walker.next() {
-        let t = match generic_arg.unpack() {
+        let t = match generic_arg.kind() {
             rustc_middle::ty::GenericArgKind::Type(t) => t,
             _ => {
                 walker.skip_current_subtree();
@@ -76,7 +76,7 @@ fn associated_type_has_attr<'tcx>(
                 );
             },
             ty::Alias(
-                ty::AliasTyKind::Projection | ty::AliasTyKind::Inherent | ty::AliasTyKind::Weak,
+                ty::AliasTyKind::Projection | ty::AliasTyKind::Inherent | ty::AliasTyKind::Free,
                 ty,
             ) => {
                 return cx.tcx.has_attrs_with_path(
@@ -100,7 +100,7 @@ fn is_unrooted_ty<'tcx>(
     let mut ret = false;
     let mut walker = ty.walk();
     while let Some(generic_arg) = walker.next() {
-        let t = match generic_arg.unpack() {
+        let t = match generic_arg.kind() {
             rustc_middle::ty::GenericArgKind::Type(t) => t,
             _ => {
                 walker.skip_current_subtree();
@@ -126,7 +126,7 @@ fn is_unrooted_ty<'tcx>(
                         ty::Alias(
                             ty::AliasTyKind::Projection |
                             ty::AliasTyKind::Inherent |
-                            ty::AliasTyKind::Weak,
+                            ty::AliasTyKind::Free,
                             ty,
                         ) => !has_attr(ty.def_id, sym.allow_unrooted_in_rc),
                         _ => true,
@@ -194,7 +194,7 @@ fn is_unrooted_ty<'tcx>(
             ty::Alias(
                 kind @ ty::AliasTyKind::Projection |
                 kind @ ty::AliasTyKind::Inherent |
-                kind @ ty::AliasTyKind::Weak,
+                kind @ ty::AliasTyKind::Free,
                 ty,
             ) => {
                 if has_attr(ty.def_id, sym.must_root) {
@@ -242,8 +242,8 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
         if has_attr(sym.must_root) || has_attr(sym.allow_unrooted_interior) {
             return;
         }
-        if let hir::ItemKind::Struct(def, ..) = &item.kind {
-            for field in def.fields() {
+        if let hir::ItemKind::Struct(_, _, variant_data) = &item.kind {
+            for field in variant_data.fields() {
                 let field_type = cx.tcx.type_of(field.def_id);
                 if is_unrooted_ty(&self.symbols, cx, field_type.skip_binder(), false) {
                     cx.lint(UNROOTED_MUST_ROOT, |lint| {
@@ -261,8 +261,8 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
     /// All enums containing #[crown::unrooted_must_root_lint::must_root] types
     /// must be #[crown::unrooted_must_root_lint::must_root] themselves
     fn check_variant(&mut self, cx: &LateContext, var: &hir::Variant) {
-        let map = &cx.tcx.hir();
-        let parent_item = map.expect_item(map.get_parent_item(var.hir_id).def_id);
+        let parent = cx.tcx.hir_get_parent_item(var.hir_id).def_id;
+        let parent_item = cx.tcx.hir_expect_item(parent);
         let sym = &self.symbols;
         if !cx.tcx.has_attrs_with_path(
             parent_item.hir_id().expect_owner(),
@@ -324,7 +324,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
                 let type_impl = cx
                     .tcx
                     .associated_items(impl_def_id)
-                    .find_by_name_and_kind(cx.tcx, trait_item.ident, ty::AssocKind::Type, trait_id)
+                    .find_by_ident_and_kind(cx.tcx, trait_item.ident, ty::AssocTag::Type, trait_id)
                     .unwrap();
 
                 let mir_ty = cx.tcx.type_of(type_impl.def_id).skip_binder();
@@ -440,7 +440,14 @@ struct FnDefVisitor<'a, 'tcx: 'a> {
 }
 
 impl<'a, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'tcx> {
-    type Map = rustc_middle::hir::map::Map<'tcx>;
+    // TODO: https://github.com/servo/servo/issues/37330
+    /*
+    type NestedFilter = rustc_middle::hir::nested_filter::OnlyBodies;
+
+    fn maybe_tcx(&mut self) -> Self::MaybeTyCtxt {
+        self.cx.tcx
+    }
+    */
 
     fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
         let cx = self.cx;
@@ -504,11 +511,7 @@ impl<'a, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'tcx> {
         visit::walk_pat(self, pat);
     }
 
-    fn visit_ty(&mut self, _: &'tcx hir::Ty) {}
-
-    fn nested_visit_map(&mut self) -> Self::Map {
-        self.cx.tcx.hir()
-    }
+    fn visit_ty(&mut self, _: &'tcx rustc_hir::Ty<'tcx, AmbigArg>) {}
 }
 
 symbols! {
diff --git a/support/crown/tests/compile_test.rs b/support/crown/tests/compile_test.rs
index f31e00b12f8..fabaab91f56 100644
--- a/support/crown/tests/compile_test.rs
+++ b/support/crown/tests/compile_test.rs
@@ -43,7 +43,7 @@ fn run_mode(mode: &'static str, bless: bool) {
 
 #[test]
 fn compile_test() {
-    let bless = env::var("BLESS").map_or(false, |x| !x.trim().is_empty());
+    let bless = env::var("BLESS").is_ok_and(|x| !x.trim().is_empty());
     run_mode("compile-fail", bless);
     run_mode("run-pass", bless);
     // UI test fails on windows