Platform is called Web not Wasm (#3393)

This commit is contained in:
daxpedda 2024-01-14 18:54:52 +01:00 committed by GitHub
parent 2ee44246ae
commit 16d860736b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 57 additions and 57 deletions

View file

@ -34,13 +34,13 @@
//! [`ControlFlow::WaitUntil`]: crate::event_loop::ControlFlow::WaitUntil
use std::path::PathBuf;
use std::sync::{Mutex, Weak};
#[cfg(not(wasm_platform))]
#[cfg(not(web_platform))]
use std::time::Instant;
#[cfg(feature = "serde")]
use serde::{Deserialize, Serialize};
use smol_str::SmolStr;
#[cfg(wasm_platform)]
#[cfg(web_platform)]
use web_time::Instant;
use crate::error::ExternalError;

View file

@ -14,9 +14,9 @@ use std::os::unix::io::{AsFd, AsRawFd, BorrowedFd, RawFd};
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::{error, fmt};
#[cfg(not(wasm_platform))]
#[cfg(not(web_platform))]
use std::time::{Duration, Instant};
#[cfg(wasm_platform)]
#[cfg(web_platform)]
use web_time::{Duration, Instant};
use crate::error::EventLoopError;
@ -130,7 +130,7 @@ impl<T> EventLoopBuilder<T> {
})
}
#[cfg(wasm_platform)]
#[cfg(web_platform)]
pub(crate) fn allow_event_loop_recreation() {
EVENT_LOOP_CREATED.store(false, Ordering::Relaxed);
}
@ -223,10 +223,10 @@ impl<T> EventLoop<T> {
///
/// Web applications are recommended to use
#[cfg_attr(
wasm_platform,
web_platform,
doc = "[`EventLoopExtWebSys::spawn()`][crate::platform::web::EventLoopExtWebSys::spawn()]"
)]
#[cfg_attr(not(wasm_platform), doc = "`EventLoopExtWebSys::spawn()`")]
#[cfg_attr(not(web_platform), doc = "`EventLoopExtWebSys::spawn()`")]
/// [^1] instead of [`run()`] to avoid the need
/// for the Javascript exception trick, and to make it clearer that the event loop runs
/// asynchronously (via the browser's own, internal, event loop) and doesn't block the
@ -236,9 +236,9 @@ impl<T> EventLoop<T> {
///
/// [`set_control_flow()`]: EventLoopWindowTarget::set_control_flow()
/// [`run()`]: Self::run()
/// [^1]: `EventLoopExtWebSys::spawn()` is only available on WASM.
/// [^1]: `EventLoopExtWebSys::spawn()` is only available on Web.
#[inline]
#[cfg(not(all(wasm_platform, target_feature = "exception-handling")))]
#[cfg(not(all(web_platform, target_feature = "exception-handling")))]
pub fn run<F>(self, event_handler: F) -> Result<(), EventLoopError>
where
F: FnMut(Event<T>, &EventLoopWindowTarget),

View file

@ -14,7 +14,7 @@ pub mod orbital;
pub mod startup_notify;
#[cfg(any(wayland_platform, docsrs))]
pub mod wayland;
#[cfg(any(wasm_platform, docsrs))]
#[cfg(any(web_platform, docsrs))]
pub mod web;
#[cfg(any(windows_platform, docsrs))]
pub mod windows;

View file

@ -58,7 +58,7 @@ pub trait EventLoopExtRunOnDemand {
/// - **iOS:** It's not possible to stop and start an `NSApplication` repeatedly on iOS.
///
#[cfg_attr(
not(wasm_platform),
not(web_platform),
doc = "[^1]: `spawn()` is only available on `wasm` platforms."
)]
///

View file

@ -34,18 +34,18 @@ use std::pin::Pin;
use std::task::{Context, Poll};
use std::time::Duration;
#[cfg(wasm_platform)]
#[cfg(web_platform)]
use web_sys::HtmlCanvasElement;
use crate::cursor::CustomCursorBuilder;
use crate::event::Event;
use crate::event_loop::{EventLoop, EventLoopWindowTarget};
#[cfg(wasm_platform)]
#[cfg(web_platform)]
use crate::platform_impl::CustomCursorFuture as PlatformCustomCursorFuture;
use crate::platform_impl::{PlatformCustomCursor, PlatformCustomCursorBuilder};
use crate::window::{CustomCursor, Window, WindowBuilder};
#[cfg(not(wasm_platform))]
#[cfg(not(web_platform))]
#[doc(hidden)]
pub struct HtmlCanvasElement;
@ -93,7 +93,7 @@ pub trait WindowBuilderExtWebSys {
///
/// [`None`] by default.
#[cfg_attr(
not(wasm_platform),
not(web_platform),
doc = "",
doc = "[`HtmlCanvasElement`]: #only-available-on-wasm"
)]
@ -150,11 +150,11 @@ pub trait EventLoopExtWebSys {
///
/// Unlike
#[cfg_attr(
all(wasm_platform, target_feature = "exception-handling"),
all(web_platform, target_feature = "exception-handling"),
doc = "`run()`"
)]
#[cfg_attr(
not(all(wasm_platform, target_feature = "exception-handling")),
not(all(web_platform, target_feature = "exception-handling")),
doc = "[`run()`]"
)]
/// [^1], this returns immediately, and doesn't throw an exception in order to
@ -166,7 +166,7 @@ pub trait EventLoopExtWebSys {
/// event loop when switching between tabs on a single page application.
///
#[cfg_attr(
not(all(wasm_platform, target_feature = "exception-handling")),
not(all(web_platform, target_feature = "exception-handling")),
doc = "[`run()`]: EventLoop::run()"
)]
/// [^1]: `run()` is _not_ available on WASM when the target supports `exception-handling`.
@ -327,7 +327,7 @@ impl CustomCursorBuilderExtWebSys for CustomCursorBuilder {
}
}
#[cfg(not(wasm_platform))]
#[cfg(not(web_platform))]
struct PlatformCustomCursorFuture;
#[derive(Debug)]

View file

@ -16,7 +16,7 @@ mod platform;
#[cfg(ios_platform)]
#[path = "ios/mod.rs"]
mod platform;
#[cfg(wasm_platform)]
#[cfg(web_platform)]
#[path = "web/mod.rs"]
mod platform;
#[cfg(orbital_platform)]
@ -63,7 +63,7 @@ impl From<Fullscreen> for RootFullscreen {
not(android_platform),
not(x11_platform),
not(wayland_platform),
not(wasm_platform),
not(web_platform),
not(orbital_platform),
))]
compile_error!("The platform you're compiling for is not supported by winit");