diff options
| -rw-r--r-- | Cargo.lock | 213 | ||||
| -rw-r--r-- | Cargo.toml | 23 | ||||
| -rw-r--r-- | src/config.rs | 13 | ||||
| -rw-r--r-- | src/types/project.rs | 6 |
4 files changed, 118 insertions, 137 deletions
@@ -143,7 +143,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -183,27 +183,6 @@ dependencies = [ ] [[package]] -name = "ashpd" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df" -dependencies = [ - "enumflags2", - "futures-channel", - "futures-util", - "rand", - "raw-window-handle", - "serde", - "serde_repr", - "tokio", - "url", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "zbus", -] - -[[package]] name = "async-broadcast" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -242,6 +221,17 @@ dependencies = [ ] [[package]] +name = "async-fs" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8034a681df4aed8b8edbd7fbe472401ecf009251c8b40556b304567052e294c5" +dependencies = [ + "async-lock", + "blocking", + "futures-lite", +] + +[[package]] name = "async-io" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -271,6 +261,17 @@ dependencies = [ ] [[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] name = "async-process" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -296,7 +297,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -331,7 +332,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -521,7 +522,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -968,7 +969,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1029,7 +1030,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1114,7 +1115,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1134,7 +1135,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1248,7 +1249,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1359,7 +1360,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1423,7 +1424,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] @@ -1453,7 +1453,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1886,19 +1886,19 @@ dependencies = [ [[package]] name = "iced_anim" version = "0.3.0" -source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#d50858f66325ea892924b5accb478ea53f6277f4" +source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#97caf811231dec5e8c34a9da61f7b72dc4965458" dependencies = [ - "iced", "iced_anim_derive", + "iced_core", ] [[package]] name = "iced_anim_derive" version = "0.2.0" -source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#d50858f66325ea892924b5accb478ea53f6277f4" +source = "git+https://github.com/BradySimon/iced_anim?branch=iced%2Fmaster#97caf811231dec5e8c34a9da61f7b72dc4965458" dependencies = [ "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -1919,9 +1919,8 @@ dependencies = [ "rust-format", "serde", "serde_json", + "smol", "thiserror 2.0.17", - "tokio", - "tokio-stream", "toml 0.9.10+spec-1.1.0", "windows_exe_info", "xdg", @@ -1976,7 +1975,7 @@ dependencies = [ [[package]] name = "iced_drop" version = "0.1.0" -source = "git+https://github.com/pml68/iced_drop?branch=master#8c85aaef1082e9ae566eba287aace670041094fa" +source = "git+https://github.com/pml68/iced_drop?branch=master#0cd6c70b2beda1e5bd0817a28e8161b92d96b0e7" dependencies = [ "iced", ] @@ -2003,7 +2002,7 @@ dependencies = [ "iced_core", "log", "rustc-hash 2.1.1", - "tokio", + "smol", "wasm-bindgen-futures", "wasmtimer", ] @@ -2031,7 +2030,7 @@ dependencies = [ [[package]] name = "iced_material" version = "0.1.0" -source = "git+https://git.sr.ht/~pml68/iced_material?branch=master#d1d689a67a275b69fc2f8e41b3e916f31eef3d3d" +source = "git+https://git.sr.ht/~pml68/iced_material?branch=master#702d23525a0ce1fb611936202b4d43c107fa921d" dependencies = [ "iced_anim", "iced_dialog", @@ -2316,7 +2315,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -2447,9 +2446,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.178" +version = "0.2.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37c93d8daa9d8a012fd8ab92f088405fb202ea0b6ab73ee2482ae66af4f42091" +checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" [[package]] name = "libfuzzer-sys" @@ -2845,7 +2844,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -2879,16 +2878,6 @@ dependencies = [ ] [[package]] -name = "num_cpus" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "num_enum" version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2907,7 +2896,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -3298,7 +3287,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -3321,10 +3310,11 @@ dependencies = [ [[package]] name = "orbclient" -version = "0.3.49" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "247ad146e19b9437f8604c21f8652423595cf710ad108af40e77d3ae6e96b827" +checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd" dependencies = [ + "libc", "libredox", ] @@ -3436,7 +3426,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -3603,7 +3593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -3906,13 +3896,12 @@ dependencies = [ [[package]] name = "rfd" version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672" +source = "git+https://github.com/PolyMeilex/rfd?rev=f3258c5#f3258c56e7099572f1a3cffc30b3677dba88142c" dependencies = [ - "ashpd", "block2 0.6.2", "dispatch2", "js-sys", + "libc", "log", "objc2 0.6.3", "objc2-app-kit 0.3.2", @@ -3920,11 +3909,13 @@ dependencies = [ "objc2-foundation 0.3.2", "pollster", "raw-window-handle", - "urlencoding", "wasm-bindgen", "wasm-bindgen-futures", + "wayland-backend", + "wayland-client", + "wayland-protocols", "web-sys", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -4182,7 +4173,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -4206,7 +4197,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -4402,6 +4393,23 @@ dependencies = [ ] [[package]] +name = "smol" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33bd3e260892199c3ccfc487c88b2da2265080acb316cd920da72fdfd7c599f" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", +] + +[[package]] name = "smol_str" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4526,9 +4534,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.112" +version = "2.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21f182278bf2d2bcb3c88b1b08a37df029d71ce3d3ae26168e3c653b213b99d4" +checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4" dependencies = [ "proc-macro2", "quote", @@ -4552,7 +4560,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -4651,7 +4659,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -4662,7 +4670,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -4764,17 +4772,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", "mio", "pin-project-lite", - "signal-hook-registry", "socket2", - "tracing", "windows-sys 0.61.2", ] @@ -4799,17 +4805,6 @@ dependencies = [ ] [[package]] -name = "tokio-stream" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" -dependencies = [ - "futures-core", - "pin-project-lite", - "tokio", -] - -[[package]] name = "tokio-util" version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4979,7 +4974,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -5119,12 +5114,6 @@ dependencies = [ ] [[package]] -name = "urlencoding" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" - -[[package]] name = "usvg" version = "0.45.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5290,7 +5279,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", "wasm-bindgen-shared", ] @@ -5750,7 +5739,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -5761,7 +5750,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -5772,7 +5761,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -5783,7 +5772,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -6297,7 +6286,7 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", "synstructure", ] @@ -6325,7 +6314,6 @@ dependencies = [ "ordered-stream", "serde", "serde_repr", - "tokio", "tracing", "uds_windows", "uuid", @@ -6345,7 +6333,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", "zbus_names", "zvariant", "zvariant_utils", @@ -6386,7 +6374,7 @@ checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -6406,7 +6394,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", "synstructure", ] @@ -6427,7 +6415,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -6460,7 +6448,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", ] [[package]] @@ -6495,9 +6483,9 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aac060176f7020d62c3bcc1cdbcec619d54f48b07ad1963a3f80ce7a0c17755f" +checksum = "4ee2a72b10d087f75fb2e1c2c7343e308fe6970527c22a41caf8372e165ff5c1" [[package]] name = "zopfli" @@ -6587,7 +6575,6 @@ dependencies = [ "endi", "enumflags2", "serde", - "url", "winnow", "zvariant_derive", "zvariant_utils", @@ -6602,7 +6589,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.112", + "syn 2.0.113", "zvariant_utils", ] @@ -6615,6 +6602,6 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.112", + "syn 2.0.113", "winnow", ] @@ -15,13 +15,13 @@ iced.version = "0.15.0-dev" iced.default-features = false iced.features = [ "wgpu", - "tiny-skia", + "x11", + "wayland", "web-colors", - "advanced", - "tokio", + "smol", "image", "svg", - "crisp", + "hinting", "linux-theme-detection", ] @@ -41,22 +41,21 @@ iced_drop.branch = "master" iced_custom_highlighter.git = "https://git.sr.ht/~pml68/iced_custom_highlighter" +rfd.git = "https://github.com/PolyMeilex/rfd" +rfd.rev = "f3258c5" + serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" toml = "0.9" -tokio = { version = "1.48", features = ["fs", "io-util"] } -tokio-stream = { version = "0.1", features = ["fs"] } -rfd = { version = "0.16", default-features = false, features = ["xdg-portal", "wayland", "tokio"] } -rust-format = { version = "0.3", features = [ - "pretty_please", - "post_process", -] } +smol = "2" +rust-format = { version = "0.3", features = ["pretty_please", "post_process"] } fxhash = "0.2" thiserror = "2" dirs-next = "2" [build-dependencies] -iced_fontello = { git = "https://github.com/pml68/iced_fontello", branch = "feat/custom-theme-renderer" } +iced_fontello.git = "https://github.com/pml68/iced_fontello" +iced_fontello.branch = "feat/custom-theme-renderer" [target.'cfg(target_os = "macos")'.dependencies] xdg = "3" diff --git a/src/config.rs b/src/config.rs index 98140e6..48e4323 100644 --- a/src/config.rs +++ b/src/config.rs @@ -6,8 +6,7 @@ use std::sync::Arc; use iced_material::Theme; use serde::{Deserialize, Serialize}; -use tokio_stream::StreamExt; -use tokio_stream::wrappers::ReadDirStream; +use smol::fs; use crate::appearance::Appearance; use crate::{Error, environment}; @@ -63,8 +62,6 @@ impl Config { } pub async fn load() -> Result<Self, Error> { - use tokio::fs; - let path = Self::config_file_path(); if !path.try_exists()? { Self::default() @@ -94,7 +91,7 @@ impl Config { pub async fn load_appearance( theme_name: &str, ) -> Result<Appearance, Error> { - use tokio::fs; + use smol::stream::StreamExt; let read_entry = async move |entry: fs::DirEntry| { let content = fs::read_to_string(entry.path()).await.ok()?; @@ -113,8 +110,7 @@ impl Config { selected = Theme::ALL[index].clone(); } - let mut stream = - ReadDirStream::new(fs::read_dir(Self::themes_dir()).await?); + let mut stream = fs::read_dir(Self::themes_dir()).await?; while let Some(entry) = stream.next().await { let Ok(entry) = entry else { continue; @@ -135,8 +131,7 @@ impl Config { } pub async fn save(self) -> Result<(), Error> { - use tokio::fs; - use tokio::io::AsyncWriteExt; + use smol::io::AsyncWriteExt; let mut file = fs::File::create(Self::config_file_path()).await?; diff --git a/src/types/project.rs b/src/types/project.rs index aac9bca..a9c4430 100644 --- a/src/types/project.rs +++ b/src/types/project.rs @@ -1,5 +1,7 @@ use std::path::{Path, PathBuf}; +use smol::fs; + extern crate fxhash; use iced::theme::{Base, Mode, Theme}; use rust_format::{Formatter, PostProcess, PrettyPlease}; @@ -39,7 +41,7 @@ impl Project { } pub async fn from_path(path: PathBuf) -> Result<(PathBuf, Self), Error> { - let contents = tokio::fs::read_to_string(&path).await?; + let contents = fs::read_to_string(&path).await?; let project: Self = serde_json::from_str(&contents)?; Ok((path, project)) @@ -62,8 +64,6 @@ impl Project { self, path: Option<PathBuf>, ) -> Result<PathBuf, Error> { - use tokio::fs; - let path = if let Some(p) = path { if let Some(parent) = p.parent() && !parent.exists() |