diff --git a/Cargo.lock b/Cargo.lock index 28468b7..d811068 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,7 +106,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "slab", ] @@ -133,7 +133,7 @@ dependencies = [ "async-io 2.2.1", "async-lock 3.1.2", "blocking", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "once_cell", ] @@ -167,7 +167,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "parking", "polling 3.3.1", "rustix 0.38.25", @@ -351,7 +351,7 @@ dependencies = [ "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite 2.0.1", + "futures-lite 2.1.0", "piper", "tracing", ] @@ -722,14 +722,13 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143" dependencies = [ "fastrand 2.0.1", "futures-core", "futures-io", - "memchr", "parking", "pin-project-lite", ] @@ -1470,9 +1469,9 @@ dependencies = [ "arc-swap", "ashpd", "async-channel 2.1.1", - "async-std", "env_logger", - "futures", + "futures-channel", + "futures-lite 2.1.0", "gettext-rs", "gettext-sys", "gio", diff --git a/Cargo.toml b/Cargo.toml index 0b5f8bc..4ab41b3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,9 +16,9 @@ disable-glycin-sandbox = [] anyhow = { version = "1.0.66", features = ["backtrace"] } arc-swap = "1.6.0" async-channel = "2.1.0" -async-std = "1.12.0" env_logger = "0.10.0" -futures = "0.3.25" +futures-channel = "0.3.25" +futures-lite = "2.1.0" glycin = "0.1.0" gvdb-macros = "0.1.6" indexmap = "2.0.0" diff --git a/src/decoder/formats/svg.rs b/src/decoder/formats/svg.rs index d7d47ee..02c3482 100644 --- a/src/decoder/formats/svg.rs +++ b/src/decoder/formats/svg.rs @@ -195,9 +195,9 @@ impl Svg { #[cfg(feature = "disable-glycin-sandbox")] image_request.sandbox_mechanism(Some(glycin::SandboxMechanism::NotSandboxed)); - let image = async_std::task::block_on(image_request.request())?; + let image = futures_lite::future::block_on(image_request.request())?; let frame_request = glycin::FrameRequest::new().scale(width as u32, height as u32); - let frame = async_std::task::block_on(image.specific_frame(frame_request))?; + let frame = futures_lite::future::block_on(image.specific_frame(frame_request))?; Ok(frame.texture) } diff --git a/src/decoder/mod.rs b/src/decoder/mod.rs index 5d70650..f561dd7 100644 --- a/src/decoder/mod.rs +++ b/src/decoder/mod.rs @@ -26,7 +26,7 @@ use anyhow::Result; use arc_swap::ArcSwap; use formats::*; pub use formats::{ImageDimensionDetails, RSVG_MAX_SIZE}; -use futures::channel::mpsc; +use futures_channel::mpsc; use tiling::FrameBufferExt; use crate::deps::*; diff --git a/src/widgets/image.rs b/src/widgets/image.rs index 6c74ba5..3a67cb8 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -49,7 +49,7 @@ use std::sync::Arc; use adw::prelude::*; use adw::subclass::prelude::*; use arc_swap::ArcSwap; -use futures::prelude::*; +use futures_lite::StreamExt; use glib::subclass::Signal; use glib::{Properties, SignalGroup}; use once_cell::sync::Lazy;