From a5c5e74f7fe62384c7387a7c8ebe828e2e913fbe Mon Sep 17 00:00:00 2001 From: RabbyDevs <67389402+RabbyDevs@users.noreply.github.com> Date: Thu, 1 May 2025 23:48:09 +0300 Subject: [PATCH] lmao cant believe i forgot that --- Cargo.lock | 318 ++++++++--------------------------------------------- Cargo.toml | 2 +- 2 files changed, 45 insertions(+), 275 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca4b27a..aa97103 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -714,11 +714,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" -[[package]] -name = "dpi" -version = "0.1.1" -source = "git+https://github.com/iced-rs/winit.git?rev=11414b6aa45699f038114e61b4ddf5102b2d3b4b#11414b6aa45699f038114e61b4ddf5102b2d3b4b" - [[package]] name = "dpi" version = "0.1.1" @@ -1381,35 +1376,19 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" -[[package]] -name = "iced" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_devtools", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_renderer 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_runtime 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_widget 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_winit 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "image", - "thiserror 1.0.69", -] - [[package]] name = "iced" version = "0.14.0-dev" source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_renderer 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_runtime 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_widget 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_winit 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_core", + "iced_debug", + "iced_devtools", + "iced_futures", + "iced_renderer", + "iced_runtime", + "iced_widget", + "iced_winit", "image", "thiserror 1.0.69", ] @@ -1417,11 +1396,11 @@ dependencies = [ [[package]] name = "iced_beacon" version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" +source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ "bincode", "futures", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", + "iced_core", "log", "semver", "serde", @@ -1432,7 +1411,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" +source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ "bitflags 2.9.0", "bytes", @@ -1447,60 +1426,35 @@ dependencies = [ "web-time", ] -[[package]] -name = "iced_core" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" -dependencies = [ - "bitflags 2.9.0", - "bytes", - "glam", - "lilt", - "log", - "num-traits", - "rustc-hash 2.1.1", - "smol_str", - "thiserror 1.0.69", - "web-time", -] - [[package]] name = "iced_debug" version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" +source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ "iced_beacon", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "log", -] - -[[package]] -name = "iced_debug" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" -dependencies = [ - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_core", + "iced_futures", "log", ] [[package]] name = "iced_devtools" version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" +source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_program 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_widget 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", + "iced_debug", + "iced_program", + "iced_widget", + "log", ] [[package]] name = "iced_futures" version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" +source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ "futures", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", + "iced_core", "log", "rustc-hash 2.1.1", "tokio", @@ -1508,39 +1462,6 @@ dependencies = [ "wasmtimer", ] -[[package]] -name = "iced_futures" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" -dependencies = [ - "futures", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "log", - "rustc-hash 2.1.1", - "wasm-bindgen-futures", - "wasmtimer", -] - -[[package]] -name = "iced_graphics" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "bitflags 2.9.0", - "bytemuck", - "cosmic-text", - "half", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "image", - "kamadak-exif", - "log", - "raw-window-handle", - "rustc-hash 2.1.1", - "thiserror 1.0.69", - "unicode-segmentation", -] - [[package]] name = "iced_graphics" version = "0.14.0-dev" @@ -1550,8 +1471,8 @@ dependencies = [ "bytemuck", "cosmic-text", "half", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_core", + "iced_futures", "image", "kamadak-exif", "log", @@ -1561,34 +1482,13 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "iced_program" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_runtime 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", -] - [[package]] name = "iced_program" version = "0.14.0-dev" source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_runtime 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", -] - -[[package]] -name = "iced_renderer" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_tiny_skia 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_wgpu 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "log", - "thiserror 1.0.69", + "iced_graphics", + "iced_runtime", ] [[package]] @@ -1596,55 +1496,26 @@ name = "iced_renderer" version = "0.14.0-dev" source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_tiny_skia 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_wgpu 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_graphics", + "iced_tiny_skia", + "iced_wgpu", "log", "thiserror 1.0.69", ] -[[package]] -name = "iced_runtime" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "bytes", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "raw-window-handle", - "thiserror 1.0.69", -] - [[package]] name = "iced_runtime" version = "0.14.0-dev" source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ "bytes", - "iced_core 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_futures 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_core", + "iced_debug", + "iced_futures", "raw-window-handle", "thiserror 1.0.69", ] -[[package]] -name = "iced_tiny_skia" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "bytemuck", - "cosmic-text", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "kurbo", - "log", - "rustc-hash 2.1.1", - "softbuffer", - "tiny-skia", -] - [[package]] name = "iced_tiny_skia" version = "0.14.0-dev" @@ -1652,8 +1523,8 @@ source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef30 dependencies = [ "bytemuck", "cosmic-text", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_debug", + "iced_graphics", "kurbo", "log", "rustc-hash 2.1.1", @@ -1669,33 +1540,14 @@ dependencies = [ "gstreamer", "gstreamer-app", "gstreamer-base", - "iced 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_wgpu 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced", + "iced_wgpu", "log", "thiserror 2.0.12", "url", "yuvutils-rs", ] -[[package]] -name = "iced_wgpu" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "bitflags 2.9.0", - "bytemuck", - "cryoglyph", - "futures", - "glam", - "guillotiere", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "log", - "rustc-hash 2.1.1", - "thiserror 1.0.69", - "wgpu", -] - [[package]] name = "iced_wgpu" version = "0.14.0-dev" @@ -1707,35 +1559,21 @@ dependencies = [ "futures", "glam", "guillotiere", - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_graphics 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_debug", + "iced_graphics", "log", "rustc-hash 2.1.1", "thiserror 1.0.69", "wgpu", ] -[[package]] -name = "iced_widget" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "iced_renderer 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_runtime 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "log", - "num-traits", - "rustc-hash 2.1.1", - "thiserror 1.0.69", - "unicode-segmentation", -] - [[package]] name = "iced_widget" version = "0.14.0-dev" source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ - "iced_renderer 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_runtime 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_renderer", + "iced_runtime", "log", "num-traits", "rustc-hash 2.1.1", @@ -1743,30 +1581,13 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "iced_winit" -version = "0.14.0-dev" -source = "git+https://github.com/RabbyDevs/iced.git?rev=388a419#388a419ed5c229aadbca57bb09b474b1475b1ef9" -dependencies = [ - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "iced_program 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", - "log", - "rustc-hash 2.1.1", - "thiserror 1.0.69", - "tracing", - "wasm-bindgen-futures", - "web-sys", - "window_clipboard", - "winit 0.30.8 (git+https://github.com/iced-rs/winit.git?rev=11414b6aa45699f038114e61b4ddf5102b2d3b4b)", -] - [[package]] name = "iced_winit" version = "0.14.0-dev" source = "git+https://github.com/RabbyDevs/iced.git#24ccb057b5b0750f2bcee7a4ef306260259ef94e" dependencies = [ - "iced_debug 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", - "iced_program 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git)", + "iced_debug", + "iced_program", "log", "rustc-hash 2.1.1", "thiserror 1.0.69", @@ -1774,7 +1595,7 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "window_clipboard", - "winit 0.30.8 (git+https://github.com/rabbydevs/winit.git)", + "winit", ] [[package]] @@ -3085,7 +2906,7 @@ version = "0.2.0" dependencies = [ "directories", "file-format", - "iced 0.14.0-dev (git+https://github.com/RabbyDevs/iced.git?rev=388a419)", + "iced", "iced_video_player", "image", "rust-embed", @@ -4612,57 +4433,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winit" -version = "0.30.8" -source = "git+https://github.com/iced-rs/winit.git?rev=11414b6aa45699f038114e61b4ddf5102b2d3b4b#11414b6aa45699f038114e61b4ddf5102b2d3b4b" -dependencies = [ - "ahash", - "android-activity", - "atomic-waker", - "bitflags 2.9.0", - "block2", - "bytemuck", - "calloop", - "cfg_aliases", - "concurrent-queue", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "cursor-icon", - "dpi 0.1.1 (git+https://github.com/iced-rs/winit.git?rev=11414b6aa45699f038114e61b4ddf5102b2d3b4b)", - "js-sys", - "libc", - "memmap2", - "ndk", - "objc2", - "objc2-app-kit", - "objc2-foundation", - "objc2-ui-kit", - "orbclient", - "percent-encoding", - "pin-project", - "raw-window-handle", - "redox_syscall 0.4.1", - "rustix 0.38.44", - "sctk-adwaita", - "smithay-client-toolkit", - "smol_str", - "tracing", - "unicode-segmentation", - "wasm-bindgen", - "wasm-bindgen-futures", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-protocols-plasma", - "web-sys", - "web-time", - "windows-sys 0.52.0", - "x11-dl", - "x11rb", - "xkbcommon-dl", -] - [[package]] name = "winit" version = "0.30.8" @@ -4680,7 +4450,7 @@ dependencies = [ "core-foundation 0.9.4", "core-graphics 0.23.2", "cursor-icon", - "dpi 0.1.1 (git+https://github.com/rabbydevs/winit.git)", + "dpi", "js-sys", "libc", "memmap2", diff --git a/Cargo.toml b/Cargo.toml index 4d3e385..bd3fb22 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2024" [dependencies] directories = "6.0.0" -iced = { git = "https://github.com/RabbyDevs/iced.git", rev = "388a419", features = ["tokio", "tiny-skia", "wgpu", "image", "debug"], default-features = false } +iced = { git = "https://github.com/RabbyDevs/iced.git", features = ["tokio", "tiny-skia", "wgpu", "image", "debug"], default-features = false } image = "0.25.6" serde = { version = "1.0.219", features = ["serde_derive"] } serde_json = "1.0.140"