From bb0d08432ee87054bbbda2cdef977fc5a28ee8de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20W=C3=BClker?= Date: Thu, 13 Mar 2025 11:28:11 +0100 Subject: Migrate to the 2024 edition (#35755) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Migrate to 2024 edition Signed-off-by: Simon Wülker * Allow unsafe_op_in_unsafe_fn lint This lint warns by default in the 2024 edition, but is *way* too noisy for servo. We might enable it in the future, but not now. Signed-off-by: Simon Wülker * Compile using the 2024 edition Signed-off-by: Simon Wülker --------- Signed-off-by: Simon Wülker --- components/script/stylesheet_loader.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'components/script/stylesheet_loader.rs') diff --git a/components/script/stylesheet_loader.rs b/components/script/stylesheet_loader.rs index 2e150d2862e..6570c3df284 100644 --- a/components/script/stylesheet_loader.rs +++ b/components/script/stylesheet_loader.rs @@ -188,7 +188,7 @@ impl FetchResponseListener for StylesheetContext { // else we risk applying the wrong stylesheet when responses come out-of-order. let is_stylesheet_load_applicable = self .request_generation_id - .is_none_or(|gen| gen == link.get_request_generation_id()); + .is_none_or(|generation| generation == link.get_request_generation_id()); if is_stylesheet_load_applicable { let shared_lock = document.style_shared_lock().clone(); let sheet = Arc::new(Stylesheet::from_bytes( @@ -314,7 +314,7 @@ impl StylesheetLoader<'_> { .elem .containing_shadow_root() .map(|sr| Trusted::new(&*sr)); - let gen = self + let generation = self .elem .downcast::() .map(HTMLLinkElement::get_request_generation_id); @@ -327,7 +327,7 @@ impl StylesheetLoader<'_> { document: Trusted::new(&*document), shadow_root, origin_clean: true, - request_generation_id: gen, + request_generation_id: generation, resource_timing: ResourceFetchTiming::new(ResourceTimingType::Resource), }; -- cgit v1.2.3