Replace instant with web-time

This commit is contained in:
dAxpeDDa 2023-06-01 17:22:28 +02:00 committed by daxpedda
parent cf77f82ae3
commit 5bbe87960e
8 changed files with 22 additions and 8 deletions

View file

@ -60,6 +60,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- On Web, fix pointer button events not being processed when a buttons is already pressed.
- **Breaking:** Updated `bitflags` crate version to `2`, which changes the API on exposed types.
- On Web, handle coalesced pointer events, which increases the resolution of pointer inputs.
- **Breaking:** On Web, `instant` is now replaced by `web_time`.
# 0.28.6

View file

@ -52,7 +52,6 @@ cfg_aliases = "0.1.1"
[dependencies]
bitflags = "2"
cursor-icon = "1.0.0"
instant = { version = "0.1", features = ["wasm-bindgen"] }
log = "0.4"
mint = { version = "0.5.6", optional = true }
once_cell = "1.12"
@ -159,6 +158,7 @@ features = [
js-sys = "0.3"
wasm-bindgen = "0.2.45"
wasm-bindgen-futures = "0.4"
web-time = "0.2"
[target.'cfg(target_family = "wasm")'.dev-dependencies]
console_log = "1"

View file

@ -1,6 +1,10 @@
#![allow(clippy::single_match)]
use std::{thread, time};
use std::thread;
#[cfg(not(wasm_platform))]
use std::time;
#[cfg(wasm_platform)]
use web_time as time;
use simple_logger::SimpleLogger;
use winit::{
@ -102,7 +106,7 @@ fn main() {
Mode::Wait => control_flow.set_wait(),
Mode::WaitUntil => {
if !wait_cancelled {
control_flow.set_wait_until(instant::Instant::now() + WAIT_TIME);
control_flow.set_wait_until(time::Instant::now() + WAIT_TIME);
}
}
Mode::Poll => {

View file

@ -1,7 +1,10 @@
#![allow(clippy::single_match)]
use instant::Instant;
use std::time::Duration;
#[cfg(not(wasm_platform))]
use std::time::Instant;
#[cfg(wasm_platform)]
use web_time::Instant;
use simple_logger::SimpleLogger;
use winit::{

View file

@ -34,9 +34,12 @@
//!
//! [`EventLoop::run(...)`]: crate::event_loop::EventLoop::run
//! [`ControlFlow::WaitUntil`]: crate::event_loop::ControlFlow::WaitUntil
use instant::Instant;
use smol_str::SmolStr;
use std::path::PathBuf;
#[cfg(not(wasm_platform))]
use std::time::Instant;
#[cfg(wasm_platform)]
use web_time::Instant;
#[cfg(doc)]
use crate::window::Window;

View file

@ -11,9 +11,12 @@ use std::marker::PhantomData;
use std::ops::Deref;
use std::{error, fmt};
use instant::{Duration, Instant};
use once_cell::sync::OnceCell;
use raw_window_handle::{HasRawDisplayHandle, RawDisplayHandle};
#[cfg(not(wasm_platform))]
use std::time::{Duration, Instant};
#[cfg(wasm_platform)]
use web_time::{Duration, Instant};
use crate::{event::Event, monitor::MonitorHandle, platform_impl};

View file

@ -3,7 +3,6 @@ use crate::event::{Event, StartCause};
use crate::event_loop::ControlFlow;
use crate::window::WindowId;
use instant::{Duration, Instant};
use std::{
cell::RefCell,
clone::Clone,
@ -12,6 +11,7 @@ use std::{
ops::Deref,
rc::{Rc, Weak},
};
use web_time::{Duration, Instant};
pub struct Shared<T: 'static>(Rc<Execution<T>>);

View file

@ -1,7 +1,7 @@
use super::backend;
use crate::event_loop::ControlFlow;
use instant::Instant;
use web_time::Instant;
#[derive(Debug)]
pub enum State {