lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code: Drop async-std dependeny

Browse source
This commit is contained in:
Sophie Herold 2023-12-25 21:52:00 +01:00
parent 4af0159341
commit d3cd32e090
5 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Cargo.lock generated
View file

@ -106,7 +106,7 @@ dependencies = [
"async-task", "async-task",
"concurrent-queue", "concurrent-queue",
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"slab", "slab",
] ]
@ -133,7 +133,7 @@ dependencies = [
"async-io 2.2.1", "async-io 2.2.1",
"async-lock 3.1.2", "async-lock 3.1.2",
"blocking", "blocking",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"once_cell", "once_cell",
] ]
@ -167,7 +167,7 @@ dependencies = [
"cfg-if", "cfg-if",
"concurrent-queue", "concurrent-queue",
"futures-io", "futures-io",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"parking", "parking",
"polling 3.3.1", "polling 3.3.1",
"rustix 0.38.25", "rustix 0.38.25",
@ -351,7 +351,7 @@ dependencies = [
"async-task", "async-task",
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-io", "futures-io",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"piper", "piper",
"tracing", "tracing",
] ]
@ -722,14 +722,13 @@ dependencies = [
[[package]] [[package]]
name = "futures-lite" name = "futures-lite"
version = "2.0.1" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
dependencies = [ dependencies = [
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-core", "futures-core",
"futures-io", "futures-io",
"memchr",
"parking", "parking",
"pin-project-lite", "pin-project-lite",
] ]
@ -1470,9 +1469,9 @@ dependencies = [
"arc-swap", "arc-swap",
"ashpd", "ashpd",
"async-channel 2.1.1", "async-channel 2.1.1",
"async-std",
"env_logger", "env_logger",
"futures", "futures-channel",
"futures-lite 2.1.0",
"gettext-rs", "gettext-rs",
"gettext-sys", "gettext-sys",
"gio", "gio",

4
Cargo.toml
View file

@ -16,9 +16,9 @@ disable-glycin-sandbox = []
anyhow = { version = "1.0.66", features = ["backtrace"] } anyhow = { version = "1.0.66", features = ["backtrace"] }
arc-swap = "1.6.0" arc-swap = "1.6.0"
async-channel = "2.1.0" async-channel = "2.1.0"
async-std = "1.12.0"
env_logger = "0.10.0" env_logger = "0.10.0"
futures = "0.3.25" futures-channel = "0.3.25"
futures-lite = "2.1.0"
glycin = "0.1.0" glycin = "0.1.0"
gvdb-macros = "0.1.6" gvdb-macros = "0.1.6"
indexmap = "2.0.0" indexmap = "2.0.0"

4
src/decoder/formats/svg.rs
View file

@ -195,9 +195,9 @@ impl Svg {
#[cfg(feature = "disable-glycin-sandbox")] #[cfg(feature = "disable-glycin-sandbox")]
image_request.sandbox_mechanism(Some(glycin::SandboxMechanism::NotSandboxed)); 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_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) Ok(frame.texture)
} }

2
src/decoder/mod.rs
View file

@ -26,7 +26,7 @@ use anyhow::Result;
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
use formats::*; use formats::*;
pub use formats::{ImageDimensionDetails, RSVG_MAX_SIZE}; pub use formats::{ImageDimensionDetails, RSVG_MAX_SIZE};
use futures::channel::mpsc; use futures_channel::mpsc;
use tiling::FrameBufferExt; use tiling::FrameBufferExt;
use crate::deps::*; use crate::deps::*;

2
src/widgets/image.rs
View file

@ -49,7 +49,7 @@ use std::sync::Arc;
use adw::prelude::*; use adw::prelude::*;
use adw::subclass::prelude::*; use adw::subclass::prelude::*;
use arc_swap::ArcSwap; use arc_swap::ArcSwap;
use futures::prelude::*; use futures_lite::StreamExt;
use glib::subclass::Signal; use glib::subclass::Signal;
use glib::{Properties, SignalGroup}; use glib::{Properties, SignalGroup};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;