Skip to content

Commit

Permalink
Fix nightly CI (#3526)
Browse files Browse the repository at this point in the history
  • Loading branch information
daxpedda authored Feb 26, 2024
1 parent 352e70b commit 010787a
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion examples/util/fill.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<RefCell<Option<GraphicsContext>>> = ManuallyDrop::new(RefCell::new(None));
static GC: ManuallyDrop<RefCell<Option<GraphicsContext>>> = const { ManuallyDrop::new(RefCell::new(None)) };
}

/// The graphics context used to draw to a window.
Expand Down
3 changes: 3 additions & 0 deletions src/platform_impl/web/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/rust-lang/rust/issues/121621> is fixed.
#![allow(unknown_lints, non_local_definitions)]

mod r#async;
mod cursor;
mod device;
Expand Down
4 changes: 2 additions & 2 deletions src/platform_impl/web/web_sys/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ pub fn pointer_move_event(event: PointerEvent) -> impl Iterator<Item = PointerEv
// See <https://github.com/rust-windowing/winit/issues/2875>.
pub fn has_pointer_raw_support(window: &web_sys::Window) -> bool {
thread_local! {
static POINTER_RAW_SUPPORT: OnceCell<bool> = OnceCell::new();
static POINTER_RAW_SUPPORT: OnceCell<bool> = const { OnceCell::new() };
}

POINTER_RAW_SUPPORT.with(|support| {
Expand All @@ -279,7 +279,7 @@ pub fn has_pointer_raw_support(window: &web_sys::Window) -> bool {
// See <https://bugs.webkit.org/show_bug.cgi?id=210454>.
pub fn has_coalesced_events_support(event: &PointerEvent) -> bool {
thread_local! {
static COALESCED_EVENTS_SUPPORT: OnceCell<bool> = OnceCell::new();
static COALESCED_EVENTS_SUPPORT: OnceCell<bool> = const { OnceCell::new() };
}

COALESCED_EVENTS_SUPPORT.with(|support| {
Expand Down
2 changes: 1 addition & 1 deletion src/platform_impl/web/web_sys/fullscreen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub fn exit_fullscreen(document: &Document, canvas: &HtmlCanvasElement) {

fn has_fullscreen_api_support(canvas: &HtmlCanvasElement) -> bool {
thread_local! {
static FULLSCREEN_API_SUPPORT: OnceCell<bool> = OnceCell::new();
static FULLSCREEN_API_SUPPORT: OnceCell<bool> = const { OnceCell::new() };
}

FULLSCREEN_API_SUPPORT.with(|support| {
Expand Down
4 changes: 2 additions & 2 deletions src/platform_impl/web/web_sys/schedule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool> = OnceCell::new();
static SCHEDULER_SUPPORT: OnceCell<bool> = const { OnceCell::new() };
}

SCHEDULER_SUPPORT.with(|support| {
Expand All @@ -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<bool> = OnceCell::new();
static IDLE_CALLBACK_SUPPORT: OnceCell<bool> = const { OnceCell::new() };
}

IDLE_CALLBACK_SUPPORT.with(|support| {
Expand Down

0 comments on commit 010787a

Please sign in to comment.