remove unmaintained instant dep

Author: kaikalii

Cargo.lock

@@ -21,7 +21,6 @@ dashmap = {version = "5", features = ["serde"]}
 ecow = {version = "0.2.2", features = ["serde"]}
 enum-iterator = "2.0.0"
 indexmap = {version = "2", features = ["serde"]}
-instant = "0.1.12"
 num_cpus = "1.16.0"
 once_cell = "1"
 parking_lot = "0.12.1"
@@ -87,6 +86,11 @@ rustfft = {version = "6.2.0", optional = true}
 rustls-pemfile = {version = "2.1.2", optional = true}
 simple_excel_writer = {version = "0.2.0", optional = true}
 
+# Web-only dependencies
+js-sys = {version = "0.3", optional = true}
+wasm-bindgen = {version = "0.2.92", optional = true}
+web-sys = {version = "0.3.60", optional = true}
+
 [features]
 audio = ["hodaun", "lockfree", "audio_encode"]
 audio_encode = ["hound"]
@@ -137,6 +141,7 @@ raw_mode = ["rawrrr", "native_sys"]
 stand = ["native_sys"]
 terminal_image = ["viuer", "image"]
 tls = ["httparse", "rustls", "webpki-roots", "rustls-pemfile"]
+web = ["wasm-bindgen", "js-sys", "web-sys"]
 webcam = ["image", "nokhwa"]
 xlsx = ["calamine", "simple_excel_writer"]
 

Cargo.toml

@@ -11,15 +11,14 @@ enum-iterator = "2.0.0"
 getrandom = {version = "0.2", features = ["js"]}
 hound = "3.5.1"
 image = "0.24.9"
-instant = {version = "0.1.12", features = ['wasm-bindgen']}
 js-sys = "0.3"
 leptos = "0.6.11"
 leptos_meta = {version = "0.6.11", features = ["csr"]}
 leptos_router = {version = "0.6.11", features = ["csr"]}
 pathdiff = "0.2.1"
 serde = {version = "1", features = ["derive"]}
 serde_json = "1"
-uiua = {path = "..", default-features = false, features = ["batteries"]}
+uiua = {path = "..", default-features = false, features = ["batteries", "web"]}
 unicode-segmentation = "1.10"
 urlencoding = "2"
 wasm-bindgen = "0.2.92"
@@ -50,5 +49,6 @@ features = [
   "FileList",
   "ResizeObserver",
   "ResizeObserverEntry",
+  "Performance",
 ]
 version = "0.3.69"

site/Cargo.toml

@@ -9,7 +9,7 @@ use std::{
 
 use crate::{editor::get_ast_time, weewuh, START_TIME};
 use leptos::*;
-use uiua::{GitTarget, Handle, Report, SysBackend, EXAMPLE_TXT, EXAMPLE_UA};
+use uiua::{now, GitTarget, Handle, Report, SysBackend, EXAMPLE_TXT, EXAMPLE_UA};
 use wasm_bindgen::prelude::*;
 use wasm_bindgen_futures::JsFuture;
 use web_sys::{Request, RequestInit, RequestMode, Response};
@@ -338,7 +338,7 @@ impl SysBackend for WebBackend {
         self.play_audio(bytes)
     }
     fn now(&self) -> f64 {
-        *START_TIME.get_or_init(|| instant::now() / 1000.0) + instant::now() / 1000.0
+        *START_TIME.get_or_init(now) + now()
     }
     fn set_clipboard(&self, contents: &str) -> Result<(), String> {
         _ = window()
@@ -349,8 +349,8 @@ impl SysBackend for WebBackend {
         Ok(())
     }
     fn sleep(&self, seconds: f64) -> Result<(), String> {
-        let start = instant::now();
-        while (instant::now() - start) / 1000.0 < seconds {}
+        let start = now();
+        while (now() - start) / 1000.0 < seconds {}
         Ok(())
     }
     fn load_git_module(&self, url: &str, target: GitTarget) -> Result<PathBuf, String> {

site/src/backend.rs

@@ -1,10 +1,10 @@
 use std::{
     collections::{HashMap, HashSet},
     iter::once,
+    time::Duration,
 };
 
 use enum_iterator::all;
-use instant::Duration;
 use leptos::{leptos_dom::helpers::location, *};
 use leptos_meta::*;
 use leptos_router::*;

site/src/docs.rs

@@ -12,7 +12,7 @@ use leptos::{
 use leptos_router::{use_navigate, BrowserIntegration, History, LocationChange, NavigateOptions};
 use uiua::{
     format::{format_str, FormatConfig},
-    is_ident_char, lex, seed_random, Primitive, SysOp, Token,
+    is_ident_char, lex, now, seed_random, Primitive, SysOp, Token,
 };
 use wasm_bindgen::{closure::Closure, JsCast, JsValue};
 use web_sys::{
@@ -187,7 +187,7 @@ pub fn Editor<'a>(
         update_token_count(&code_text);
 
         // Format code
-        let seed = instant::now().to_bits();
+        let seed = now().to_bits();
         seed_random(seed);
         let input = if format {
             if let Ok(formatted) = format_str(

site/src/editor/mod.rs

@@ -13,17 +13,16 @@ mod tour;
 mod tutorial;
 mod uiuisms;
 
-use std::sync::OnceLock;
+use std::{sync::OnceLock, time::Duration};
 
 use base64::engine::{general_purpose::URL_SAFE, Engine};
-use instant::Duration;
 use js_sys::Date;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
 use uiua::{
     lsp::{BindingDocs, BindingDocsKind},
-    ConstantDef, PrimClass, Primitive, Signature, SysOp,
+    now, ConstantDef, PrimClass, Primitive, Signature, SysOp,
 };
 use wasm_bindgen::JsCast;
 use web_sys::{Element, HtmlAudioElement};
@@ -195,7 +194,7 @@ pub fn Site() -> impl IntoView {
 }
 
 fn weewuh() {
-    let i = (instant::now() / 1000.0 % 1.0 * 100.0) as u32;
+    let i = (now() / 1000.0 % 1.0 * 100.0) as u32;
     let src = match i {
         0 => "/assets/ooh-ee-ooh-ah.mp3",
         1..=4 => "/assets/wee-wah.mp3",

site/src/main.rs

@@ -13,11 +13,11 @@ use std::{
     path::{Path, PathBuf},
     rc::Rc,
     sync::Arc,
+    time::Duration,
 };
 
 use ecow::{eco_vec, EcoString, EcoVec};
 use indexmap::IndexMap;
-use instant::Duration;
 use serde::{Deserialize, Serialize};
 
 use crate::{

src/compile/mod.rs

@@ -8,9 +8,9 @@ use std::{
     fs,
     iter::repeat,
     path::{Path, PathBuf},
+    time::Duration,
 };
 
-use instant::Duration;
 use paste::paste;
 
 use crate::{

src/format.rs

@@ -8,12 +8,11 @@ use std::{
     process::{exit, Child, Command, Stdio},
     sync::mpsc::channel,
     thread::sleep,
-    time::Duration,
+    time::{Duration, Instant},
 };
 
 use clap::{error::ErrorKind, Parser};
 use colored::*;
-use instant::Instant;
 use notify::{EventKind, RecursiveMode, Watcher};
 use once_cell::sync::Lazy;
 use parking_lot::Mutex;

src/main.rs

@@ -14,11 +14,11 @@ use std::{
         atomic::{self, AtomicBool},
         Arc,
     },
+    time::Duration,
 };
 
 use crossbeam_channel::{Receiver, Sender, TryRecvError};
 use enum_iterator::{all, Sequence};
-use instant::Duration;
 use thread_local::ThreadLocal;
 
 use crate::{
@@ -270,7 +270,7 @@ impl Uiua {
     }
     /// Limit the execution duration
     pub fn with_execution_limit(mut self, limit: Duration) -> Self {
-        self.rt.execution_limit = Some(limit.as_millis() as f64);
+        self.rt.execution_limit = Some(limit.as_secs_f64());
         self
     }
     /// Set the command line arguments
@@ -337,7 +337,7 @@ impl Uiua {
     pub fn run_asm(&mut self, asm: impl Into<Assembly>) -> UiuaResult {
         fn run_asm(env: &mut Uiua, asm: Assembly) -> UiuaResult {
             env.asm = asm;
-            env.rt.execution_start = instant::now();
+            env.rt.execution_start = env.rt.backend.now();
             let res = env.run_top_slices();
             if res.is_err() {
                 env.rt = Runtime {
@@ -431,16 +431,16 @@ code:
 
             if self.rt.time_instrs {
                 formatted_instr = format!("{instr:?}");
-                self.rt.last_time = instant::now();
+                self.rt.last_time = self.rt.backend.now();
             }
             let res = match instr {
                 Instr::Comment(_) => Ok(()),
                 // Pause execution timer during &sc
                 &Instr::Prim(prim @ Primitive::Sys(SysOp::ScanLine), span) => {
                     self.with_prim_span(span, Some(prim), |env| {
-                        let start = instant::now();
+                        let start = env.rt.backend.now();
                         let res = prim.run(env);
-                        env.rt.execution_start += instant::now() - start;
+                        env.rt.execution_start += env.rt.backend.now() - start;
                         res
                     })
                 }
@@ -664,7 +664,7 @@ code:
                 }
             };
             if self.rt.time_instrs {
-                let end_time = instant::now();
+                let end_time = self.rt.backend.now();
                 let padding = self.rt.call_stack.len().saturating_sub(1) * 2;
                 #[rustfmt::skip]
                 println!( // Allow println
@@ -673,7 +673,7 @@ code:
                     end_time - self.rt.last_time,
                     formatted_instr
                 );
-                self.rt.last_time = instant::now();
+                self.rt.last_time = self.rt.backend.now();
             }
             if let Err(mut err) = res {
                 // Trace errors
@@ -695,7 +695,7 @@ code:
     /// Timeout if an execution limit is set and has been exceeded
     pub fn respect_execution_limit(&self) -> UiuaResult {
         if let Some(limit) = self.rt.execution_limit {
-            if instant::now() - self.rt.execution_start > limit {
+            if self.rt.backend.now() - self.rt.execution_start > limit {
                 return Err(
                     UiuaErrorKind::Timeout(self.span(), self.inputs().clone().into()).into(),
                 );

src/run.rs

@@ -923,7 +923,7 @@ pub trait SysBackend: Any + Send + Sync + 'static {
     ///
     /// Should be in seconds
     fn now(&self) -> f64 {
-        instant::now() / 1000.0
+        now()
     }
     /// Create a TCP listener and bind it to an address
     fn tcp_listen(&self, addr: &str) -> Result<Handle, String> {
@@ -2452,3 +2452,32 @@ pub fn gif_bytes_to_value(bytes: &[u8]) -> Result<(f64, Value), gif::DecodingErr
     num.compress();
     Ok((frame_rate, num))
 }
+
+/// Get the current time in seconds
+///
+/// This function works on both native and web targets.
+pub fn now() -> f64 {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        std::time::SystemTime::now()
+            .duration_since(std::time::SystemTime::UNIX_EPOCH)
+            .expect("System clock was before 1970.")
+            .as_secs_f64()
+    }
+    #[cfg(target_arch = "wasm32")]
+    {
+        #[cfg(not(feature = "web"))]
+        {
+            compile_error!("Web target requires the `web` feature")
+        }
+        #[cfg(feature = "web")]
+        {
+            use wasm_bindgen::{prelude::*, JsCast};
+            js_sys::Reflect::get(&js_sys::global(), &JsValue::from_str("performance"))
+                .expect("failed to get performance from global object")
+                .unchecked_into::<web_sys::Performance>()
+                .now()
+                / 1000.0
+        }
+    }
+}