feat: fix all dependencies to specific version numbers to allow non---locked builds (#821)

This commit is contained in:
三咲雅 · Misaki Masa 2024-03-16 02:29:37 +08:00 committed by GitHub
parent 411ba2fe85
commit 80aebda22c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 166 additions and 170 deletions

52
Cargo.lock generated
View File

@ -371,9 +371,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.5.2"
version = "4.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651"
checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813"
dependencies = [
"clap_builder",
"clap_derive",
@ -422,11 +422,11 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.5.0"
version = "4.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f"
dependencies = [
"heck",
"heck 0.5.0",
"proc-macro2",
"quote",
"syn 2.0.52",
@ -440,13 +440,11 @@ checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
[[package]]
name = "clipboard-win"
version = "4.5.0"
version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362"
checksum = "d517d4b86184dbb111d3556a10f1c8a04da7428d2987bf1081602bf11c3aa9ee"
dependencies = [
"error-code",
"str-buf",
"winapi",
]
[[package]]
@ -700,13 +698,9 @@ dependencies = [
[[package]]
name = "error-code"
version = "2.3.1"
version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21"
dependencies = [
"libc",
"str-buf",
]
checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b"
[[package]]
name = "event-listener"
@ -967,6 +961,12 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
[[package]]
name = "hermit-abi"
version = "0.3.9"
@ -1406,9 +1406,9 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
[[package]]
name = "new_debug_unreachable"
version = "1.0.4"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
[[package]]
name = "nom"
@ -2195,12 +2195,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "str-buf"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
[[package]]
name = "strsim"
version = "0.10.0"
@ -2228,7 +2222,7 @@ version = "0.26.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
dependencies = [
"heck",
"heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
@ -2285,7 +2279,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8e9199467bcbc77c6a13cc6e32a6af21721ab8c96aa0261856c4fda5a4433f0"
dependencies = [
"cfg-expr",
"heck",
"heck 0.4.1",
"pkg-config",
"toml",
"version-compare",
@ -2438,9 +2432,9 @@ dependencies = [
[[package]]
name = "tokio-stream"
version = "0.1.14"
version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
dependencies = [
"futures-core",
"pin-project-lite",
@ -2566,9 +2560,9 @@ dependencies = [
[[package]]
name = "trash"
version = "3.3.1"
version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c658458d46d9d5a153a3b5cdd88d8579ad50d4fb85d53961e4526c8fc7c55a57"
checksum = "e624eab7d472380d3e0321367d9bf0e931e91e1bd9b80422b9b4b64be2d7f328"
dependencies = [
"chrono",
"libc",

View File

@ -1,6 +1,7 @@
[workspace]
resolver = "2"
members = [ "yazi-*" ]
resolver = "2"
members = [ "yazi-*" ]
default-members = [ "yazi-fm" ]
[profile.release]
codegen-units = 1

View File

@ -13,16 +13,16 @@ yazi-config = { path = "../yazi-config", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
anyhow = "^1"
arc-swap = "^1"
base64 = "^0"
color_quant = "^1"
crossterm = "^0"
image = "^0"
imagesize = "^0"
kamadak-exif = "0"
ratatui = "^0"
tokio = { version = "^1", features = [ "parking_lot", "io-util", "process" ] }
anyhow = "1.0.81"
arc-swap = "1.7.0"
base64 = "0.22.0"
color_quant = "1.1.0"
crossterm = "0.27.0"
image = "0.25.0"
imagesize = "0.12.0"
kamadak-exif = "0.5.5"
ratatui = "0.26.1"
tokio = { version = "1.36.0", features = [ "parking_lot", "io-util", "process" ] }
# Logging
tracing = { version = "^0", features = [ "max_level_debug", "release_max_level_warn" ] }
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }

View File

@ -31,7 +31,7 @@ impl Iterm2 {
Term::move_lock(stderr, (0, 0), |stderr| {
for y in rect.top()..rect.bottom() {
Term::move_to(stderr, rect.x, y)?;
stderr.write_all(s.as_bytes())?;
write!(stderr, "{s}")?;
}
Ok(())
})

View File

@ -315,28 +315,15 @@ impl Kitty {
pub(super) async fn image_show(path: &Path, rect: Rect) -> Result<(u32, u32)> {
let img = Image::downscale(path, rect).await?;
let size = (img.width(), img.height());
let b = Self::encode(img).await?;
let b1 = Self::encode(img).await?;
let b2 = Self::place(&rect)?;
Adaptor::Kitty.image_hide()?;
Adaptor::shown_store(rect, size);
Term::move_lock(stderr().lock(), (rect.x, rect.y), |stderr| {
stderr.write_all(&b)?;
let mut buf = String::with_capacity(rect.width as usize * 3 + 20);
for y in 0..rect.height {
Term::move_to(stderr, rect.x, rect.y + y)?;
buf.clear();
buf.push_str("\x1b[38;5;1m");
for x in 0..rect.width {
buf.push('\u{10EEEE}');
buf.push(*DIACRITICS.get(y as usize).unwrap_or(&DIACRITICS[0]));
buf.push(*DIACRITICS.get(x as usize).unwrap_or(&DIACRITICS[0]));
}
buf.push_str("\x1b[0m");
stderr.write_all(buf.as_bytes())?;
}
stderr.write_all(&b1)?;
stderr.write_all(&b2)?;
Ok(size)
})
}
@ -347,10 +334,10 @@ impl Kitty {
Term::move_lock(stderr, (0, 0), |stderr| {
for y in rect.top()..rect.bottom() {
Term::move_to(stderr, rect.x, y)?;
stderr.write_all(s.as_bytes())?;
write!(stderr, "{s}")?;
}
stderr.write_all(format!("{}_Gq=1,a=d,d=A{}\\{}", START, ESCAPE, CLOSE).as_bytes())?;
write!(stderr, "{}_Gq=1,a=d,d=A{}\\{}", START, ESCAPE, CLOSE)?;
Ok(())
})
}
@ -388,7 +375,7 @@ impl Kitty {
)?;
}
buf.write_all(CLOSE.as_bytes())?;
write!(buf, "{}", CLOSE)?;
Ok(buf)
}
@ -400,4 +387,18 @@ impl Kitty {
})
.await?
}
fn place(rect: &Rect) -> Result<Vec<u8>> {
let mut buf = Vec::with_capacity(rect.width as usize * rect.height as usize * 3 + 50);
for y in 0..rect.height {
write!(buf, "\x1b[{};{}H\x1b[38;5;1m", rect.y + y + 1, rect.x + 1)?;
for x in 0..rect.width {
write!(buf, "{}", '\u{10EEEE}')?;
write!(buf, "{}", *DIACRITICS.get(y as usize).unwrap_or(&DIACRITICS[0]))?;
write!(buf, "{}", *DIACRITICS.get(x as usize).unwrap_or(&DIACRITICS[0]))?;
}
write!(buf, "\x1b[0m")?;
}
Ok(buf)
}
}

View File

@ -28,7 +28,7 @@ impl KittyOld {
#[inline]
pub(super) fn image_erase() -> Result<()> {
let mut stderr = stderr().lock();
stderr.write_all(format!("{}_Gq=1,a=d,d=A{}\\{}", START, ESCAPE, CLOSE).as_bytes())?;
write!(stderr, "{}_Gq=1,a=d,d=A{}\\{}", START, ESCAPE, CLOSE)?;
stderr.flush()?;
Ok(())
}
@ -66,7 +66,7 @@ impl KittyOld {
)?;
}
buf.write_all(CLOSE.as_bytes())?;
write!(buf, "{}", CLOSE)?;
Ok(buf)
}

View File

@ -31,7 +31,7 @@ impl Sixel {
Term::move_lock(stderr, (0, 0), |stderr| {
for y in rect.top()..rect.bottom() {
Term::move_to(stderr, rect.x, y)?;
stderr.write_all(s.as_bytes())?;
write!(stderr, "{s}")?;
}
Ok(())
})

View File

@ -14,12 +14,12 @@ yazi-config = { path = "../yazi-config", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
clap = { version = "^4", features = [ "derive" ] }
serde = { version = "^1", features = [ "derive" ] }
clap = { version = "4.5.3", features = [ "derive" ] }
serde = { version = "1.0.197", features = [ "derive" ] }
[build-dependencies]
clap = { version = "^4", features = [ "derive" ] }
clap_complete = "^4"
clap_complete_nushell = "^4"
clap_complete_fig = "^4"
vergen = { version = "^8", features = [ "build", "git", "gitcl" ] }
clap = { version = "4.5.3", features = [ "derive" ] }
clap_complete = "4.5.1"
clap_complete_nushell = "4.5.1"
clap_complete_fig = "4.5.0"
vergen = { version = "8.3.1", features = [ "build", "git", "gitcl" ] }

View File

@ -12,15 +12,15 @@ repository = "https://github.com/sxyazi/yazi"
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
anyhow = "^1"
arc-swap = "^1"
crossterm = "^0"
futures = "^0"
glob = "^0"
indexmap = "^2"
md-5 = "^0"
ratatui = "^0"
serde = { version = "^1", features = [ "derive" ] }
shell-words = "^1"
toml = { version = "^0", features = [ "preserve_order" ] }
validator = { version = "^0", features = [ "derive" ] }
anyhow = "1.0.81"
arc-swap = "1.7.0"
crossterm = "0.27.0"
futures = "0.3.30"
glob = "0.3.1"
indexmap = "2.2.5"
md-5 = "0.10.6"
ratatui = "0.26.1"
serde = { version = "1.0.197", features = [ "derive" ] }
shell-words = "1.1.0"
toml = { version = "0.8.11", features = [ "preserve_order" ] }
validator = { version = "0.17.0", features = [ "derive" ] }

View File

@ -18,27 +18,27 @@ yazi-scheduler = { path = "../yazi-scheduler", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
anyhow = "^1"
base64 = "^0"
bitflags = "^2"
crossterm = "^0"
futures = "^0"
indexmap = "^2"
notify = { version = "^6", default-features = false, features = [ "macos_fsevent" ] }
parking_lot = "^0"
ratatui = "^0"
regex = "^1"
serde = "^1"
tokio = { version = "^1", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs", "process", "io-std", "io-util" ] }
tokio-stream = "^0"
tokio-util = "^0"
unicode-width = "^0"
anyhow = "1.0.81"
base64 = "0.22.0"
bitflags = "2.4.2"
crossterm = "0.27.0"
futures = "0.3.30"
indexmap = "2.2.5"
notify = { version = "6.1.1", default-features = false, features = [ "macos_fsevent" ] }
parking_lot = "0.12.1"
ratatui = "0.26.1"
regex = "1.10.3"
serde = "1.0.197"
tokio = { version = "1.36.0", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs", "process", "io-std", "io-util" ] }
tokio-stream = "0.1.15"
tokio-util = "0.7.10"
unicode-width = "0.1.11"
# Logging
tracing = { version = "^0", features = [ "max_level_debug", "release_max_level_warn" ] }
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
[target."cfg(unix)".dependencies]
libc = "^0"
libc = "0.2.153"
[target."cfg(windows)".dependencies]
clipboard-win = "^4"
clipboard-win = "5.3.0"

View File

@ -19,29 +19,29 @@ yazi-scheduler = { path = "../yazi-scheduler", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
anyhow = "^1"
better-panic = "^0"
crossterm = { version = "^0", features = [ "event-stream" ] }
fdlimit = "^0"
futures = "^0"
mlua = { version = "^0", features = [ "lua54", "vendored" ] }
ratatui = "^0"
syntect = { version = "^5", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
tokio = { version = "^1", features = [ "parking_lot" ] }
tokio-util = "^0"
unicode-width = "^0"
anyhow = "1.0.81"
better-panic = "0.3.0"
crossterm = { version = "0.27.0", features = [ "event-stream" ] }
fdlimit = "0.3.0"
futures = "0.3.30"
mlua = { version = "0.9.6", features = [ "lua54", "vendored" ] }
ratatui = "0.26.1"
syntect = { version = "5.2.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
tokio = { version = "1.36.0", features = [ "parking_lot" ] }
tokio-util = "0.7.10"
unicode-width = "0.1.11"
# Logging
tracing = { version = "^0", features = [ "max_level_debug", "release_max_level_warn" ] }
tracing-appender = "^0"
tracing-subscriber = "^0"
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
tracing-appender = "0.2.3"
tracing-subscriber = "0.3.18"
[target."cfg(unix)".dependencies]
libc = "^0"
signal-hook-tokio = { version = "^0", features = [ "futures-v0_3" ] }
libc = "0.2.153"
signal-hook-tokio = { version = "0.3.1", features = [ "futures-v0_3" ] }
[target.'cfg(all(not(target_os = "macos"), not(target_os = "windows")))'.dependencies]
tikv-jemallocator = "^0"
tikv-jemallocator = "0.5.4"
[[bin]]
name = "yazi"

View File

@ -16,24 +16,24 @@ yazi-proxy = { path = "../yazi-proxy", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
ansi-to-tui = "^3"
anyhow = "^1"
crossterm = "^0"
futures = "^0"
md-5 = "^0"
mlua = { version = "^0", features = [ "lua54", "vendored", "serialize", "macros", "async" ] }
parking_lot = "^0"
ratatui = "^0"
serde = "^1"
serde_json = "^1"
shell-escape = "^0"
shell-words = "^1"
syntect = { version = "^5", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
tokio = { version = "^1", features = [ "parking_lot", "rt-multi-thread" ] }
tokio-util = "^0"
tracing = { version = "^0", features = [ "max_level_debug", "release_max_level_warn" ] }
unicode-width = "^0"
ansi-to-tui = "3.1.0"
anyhow = "1.0.81"
crossterm = "0.27.0"
futures = "0.3.30"
md-5 = "0.10.6"
mlua = { version = "0.9.6", features = [ "lua54", "vendored", "serialize", "macros", "async" ] }
parking_lot = "0.12.1"
ratatui = "0.26.1"
serde = "1.0.197"
serde_json = "1.0.114"
shell-escape = "0.1.5"
shell-words = "1.1.0"
syntect = { version = "5.2.0", default-features = false, features = [ "parsing", "plist-load", "regex-onig" ] }
tokio = { version = "1.36.0", features = [ "parking_lot", "rt-multi-thread" ] }
tokio-util = "0.7.10"
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
unicode-width = "0.1.11"
yazi-prebuild = "0.1.2"
[target."cfg(unix)".dependencies]
uzers = "^0"
uzers = "0.11.3"

View File

@ -13,6 +13,6 @@ yazi-config = { path = "../yazi-config", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
anyhow = "^1"
mlua = { version = "^0", features = [ "lua54", "vendored" ] }
tokio = { version = "^1", features = [ "parking_lot" ] }
anyhow = "1.0.81"
mlua = { version = "0.9.6", features = [ "lua54", "vendored" ] }
tokio = { version = "1.36.0", features = [ "parking_lot" ] }

View File

@ -16,22 +16,22 @@ yazi-proxy = { path = "../yazi-proxy", version = "0.2.4" }
yazi-shared = { path = "../yazi-shared", version = "0.2.4" }
# External dependencies
anyhow = "^1"
async-priority-channel = "^0"
base64 = "^0"
crossterm = "^0"
futures = "^0"
parking_lot = "^0"
regex = "^1"
tokio = { version = "^1", features = [ "parking_lot", "rt-multi-thread" ] }
tokio-stream = "^0"
tokio-util = "^0"
anyhow = "1.0.81"
async-priority-channel = "0.2.0"
base64 = "0.22.0"
crossterm = "0.27.0"
futures = "0.3.30"
parking_lot = "0.12.1"
regex = "1.10.3"
tokio = { version = "1.36.0", features = [ "parking_lot", "rt-multi-thread" ] }
tokio-stream = "0.1.15"
tokio-util = "0.7.10"
# Logging
tracing = { version = "^0", features = [ "max_level_debug", "release_max_level_warn" ] }
tracing = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
[target."cfg(unix)".dependencies]
libc = "^0"
libc = "0.2.153"
[target.'cfg(not(target_os = "android"))'.dependencies]
trash = "^3"
trash = "4.0.0"

View File

@ -9,17 +9,17 @@ homepage = "https://yazi-rs.github.io"
repository = "https://github.com/sxyazi/yazi"
[dependencies]
anyhow = "^1"
bitflags = "^2"
crossterm = "^0"
dirs = "^5"
futures = "^0"
parking_lot = "^0"
percent-encoding = "^2"
ratatui = "^0"
regex = "^1"
serde = "^1"
tokio = { version = "^1", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs" ] }
anyhow = "1.0.81"
bitflags = "2.4.2"
crossterm = "0.27.0"
dirs = "5.0.1"
futures = "0.3.30"
parking_lot = "0.12.1"
percent-encoding = "2.3.1"
ratatui = "0.26.1"
regex = "1.10.3"
serde = "1.0.197"
tokio = { version = "1.36.0", features = [ "parking_lot", "macros", "rt-multi-thread", "sync", "time", "fs" ] }
[target."cfg(unix)".dependencies]
libc = "^0"
libc = "0.2.153"

View File

@ -1,7 +1,7 @@
use std::io::{stderr, Write};
use anyhow::Result;
use crossterm::{cursor::{MoveTo, RestorePosition, SavePosition, SetCursorStyle}, execute, queue};
use crossterm::{cursor::{MoveTo, RestorePosition, SavePosition, SetCursorStyle}, queue};
use super::Term;
@ -44,8 +44,8 @@ impl Term {
}
#[inline]
pub fn set_cursor_block() -> Result<()> { Ok(execute!(stderr(), SetCursorStyle::BlinkingBlock)?) }
pub fn set_cursor_block() -> Result<()> { Ok(queue!(stderr(), SetCursorStyle::BlinkingBlock)?) }
#[inline]
pub fn set_cursor_bar() -> Result<()> { Ok(execute!(stderr(), SetCursorStyle::BlinkingBar)?) }
pub fn set_cursor_bar() -> Result<()> { Ok(queue!(stderr(), SetCursorStyle::BlinkingBar)?) }
}