From a8bdd49072cff9df1e54d4541e3f0a910c07129b Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Mon, 27 Jul 2026 17:43:31 +0700 Subject: [PATCH] . --- Cargo.lock | 61 ++++++++++++++++++++++++++----------------------- web/Cargo.toml | 2 +- web/src/main.rs | 8 +++---- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a22c35..af45a01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1228,7 +1228,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "gpui_util", "indexmap", @@ -1398,7 +1398,7 @@ dependencies = [ "tokio", "tracing-wasm", "ui", - "universal-time", + "universal-time 0.3.0 (git+https://github.com/shadowylab/universal-time)", "wasm-bindgen", "web-time", "workspace", @@ -1712,7 +1712,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "proc-macro2", "quote", @@ -2608,7 +2608,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "accesskit", "anyhow", @@ -2690,7 +2690,7 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "accesskit", "accesskit_unix", @@ -2742,7 +2742,7 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "accesskit", "accesskit_macos", @@ -2791,7 +2791,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2802,7 +2802,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "console_error_panic_hook", "gpui", @@ -2815,7 +2815,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "schemars", "serde", @@ -2825,7 +2825,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "gpui", @@ -2836,7 +2836,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "log", @@ -2846,7 +2846,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2870,7 +2870,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "bytemuck", @@ -2900,7 +2900,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "accesskit", "accesskit_windows", @@ -3190,7 +3190,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "async-compression", @@ -3210,7 +3210,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "rustls", "rustls-platform-verifier", @@ -4005,7 +4005,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "bindgen", @@ -4217,7 +4217,7 @@ dependencies = [ "serde", "serde_json", "unicode-normalization", - "universal-time", + "universal-time 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "url", ] @@ -4322,7 +4322,7 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "universal-time", + "universal-time 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4908,7 +4908,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "collections", "serde", @@ -5719,7 +5719,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "derive_refineable", ] @@ -5801,7 +5801,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "bytes", @@ -6116,7 +6116,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "async-task", "backtrace", @@ -6740,7 +6740,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "heapless 0.9.3", "log", @@ -7667,6 +7667,11 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f942cacf37a673350e8f252dff4691fb8e525a5fff6e1f2c4b6c2f3b8349248d" +[[package]] +name = "universal-time" +version = "0.3.0" +source = "git+https://github.com/shadowylab/universal-time#44737e436b17fadfeb779961e93a0828c8276c14" + [[package]] name = "untrusted" version = "0.9.0" @@ -7734,7 +7739,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "perf", "quote", @@ -9467,7 +9472,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "anyhow", "chrono", @@ -9484,7 +9489,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" dependencies = [ "tracing", "tracing-subscriber", @@ -9495,7 +9500,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#63b52a7ee354741a7485e8a20ab087a485fcb8a1" +source = "git+https://github.com/zed-industries/zed#1ca8f8396b08b0121a991c710e02c81ebe3016de" [[package]] name = "zune-core" diff --git a/web/Cargo.toml b/web/Cargo.toml index bb537b8..ca81120 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -26,7 +26,7 @@ console_error_panic_hook = "0.1" tracing-wasm = "0.2" console_log = "1.0" wasm-bindgen = "0.2" -universal-time = "0.3.0" +universal-time = { git = "https://github.com/shadowylab/universal-time" } web-time = "1.1.0" [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/web/src/main.rs b/web/src/main.rs index 4db9711..9918322 100644 --- a/web/src/main.rs +++ b/web/src/main.rs @@ -1,8 +1,8 @@ -use std::time::Duration; - use gpui::*; use ui::Root; -use universal_time::{Instant, MonotonicClock, SystemTime, WallClock, define_time_provider}; +use universal_time::{ + Duration, Instant, MonotonicClock, SystemTime, WallClock, define_time_provider, +}; use wasm_bindgen::prelude::*; struct CustomTimeProvider; @@ -22,7 +22,7 @@ impl MonotonicClock for CustomTimeProvider { define_time_provider!(CustomTimeProvider); fn main() { - // Binary entry point — actual initialization happens in `run()` below, + // Binary entry point, actual initialization happens in `run()` below, // which is called explicitly from JavaScript after the WASM module loads. }