From d2acea95ccd2b834bb4175124d4376055bff92a4 Mon Sep 17 00:00:00 2001 From: daxpedda Date: Mon, 26 Feb 2024 09:46:12 +0100 Subject: [PATCH] Fix nightly CI --- examples/util/fill.rs | 2 +- src/platform_impl/web/mod.rs | 3 +++ src/platform_impl/web/web_sys/event.rs | 4 ++-- src/platform_impl/web/web_sys/fullscreen.rs | 2 +- src/platform_impl/web/web_sys/schedule.rs | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/examples/util/fill.rs b/examples/util/fill.rs index 1136e7ae1..4fcf67f4e 100644 --- a/examples/util/fill.rs +++ b/examples/util/fill.rs @@ -28,7 +28,7 @@ mod platform { // ManuallyDrop to prevent destructors from running. // // A static, thread-local map of graphics contexts to open windows. - static GC: ManuallyDrop>> = ManuallyDrop::new(RefCell::new(None)); + static GC: ManuallyDrop>> = const { ManuallyDrop::new(RefCell::new(None)) }; } /// The graphics context used to draw to a window. diff --git a/src/platform_impl/web/mod.rs b/src/platform_impl/web/mod.rs index 3abd26841..831fa5a86 100644 --- a/src/platform_impl/web/mod.rs +++ b/src/platform_impl/web/mod.rs @@ -17,6 +17,9 @@ // incoming events (from the registered handlers) and ensuring they are passed to the user in a // compliant way. +// TODO: FP, remove when is fixed. +#![allow(unknown_lints, non_local_definitions)] + mod r#async; mod device; mod error; diff --git a/src/platform_impl/web/web_sys/event.rs b/src/platform_impl/web/web_sys/event.rs index 122ad35ec..274b9f2c1 100644 --- a/src/platform_impl/web/web_sys/event.rs +++ b/src/platform_impl/web/web_sys/event.rs @@ -256,7 +256,7 @@ pub fn pointer_move_event(event: PointerEvent) -> impl Iterator. pub fn has_pointer_raw_support(window: &web_sys::Window) -> bool { thread_local! { - static POINTER_RAW_SUPPORT: OnceCell = OnceCell::new(); + static POINTER_RAW_SUPPORT: OnceCell = const { OnceCell::new() }; } POINTER_RAW_SUPPORT.with(|support| { @@ -279,7 +279,7 @@ pub fn has_pointer_raw_support(window: &web_sys::Window) -> bool { // See . pub fn has_coalesced_events_support(event: &PointerEvent) -> bool { thread_local! { - static COALESCED_EVENTS_SUPPORT: OnceCell = OnceCell::new(); + static COALESCED_EVENTS_SUPPORT: OnceCell = const { OnceCell::new() }; } COALESCED_EVENTS_SUPPORT.with(|support| { diff --git a/src/platform_impl/web/web_sys/fullscreen.rs b/src/platform_impl/web/web_sys/fullscreen.rs index 6ad1ae3e5..03e680d33 100644 --- a/src/platform_impl/web/web_sys/fullscreen.rs +++ b/src/platform_impl/web/web_sys/fullscreen.rs @@ -11,7 +11,7 @@ use web_sys::{Document, Element, HtmlCanvasElement}; use super::EventListenerHandle; thread_local! { - static FULLSCREEN_API_SUPPORT: OnceCell = OnceCell::new(); + static FULLSCREEN_API_SUPPORT: OnceCell = const { OnceCell::new() }; } pub struct FullscreenHandler { diff --git a/src/platform_impl/web/web_sys/schedule.rs b/src/platform_impl/web/web_sys/schedule.rs index 0d3983697..f13a3b1a0 100644 --- a/src/platform_impl/web/web_sys/schedule.rs +++ b/src/platform_impl/web/web_sys/schedule.rs @@ -199,7 +199,7 @@ fn duration_millis_ceil(duration: Duration) -> u32 { fn has_scheduler_support(window: &web_sys::Window) -> bool { thread_local! { - static SCHEDULER_SUPPORT: OnceCell = OnceCell::new(); + static SCHEDULER_SUPPORT: OnceCell = const { OnceCell::new() }; } SCHEDULER_SUPPORT.with(|support| { @@ -221,7 +221,7 @@ fn has_scheduler_support(window: &web_sys::Window) -> bool { fn has_idle_callback_support(window: &web_sys::Window) -> bool { thread_local! { - static IDLE_CALLBACK_SUPPORT: OnceCell = OnceCell::new(); + static IDLE_CALLBACK_SUPPORT: OnceCell = const { OnceCell::new() }; } IDLE_CALLBACK_SUPPORT.with(|support| {