mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: upgrade ansi-to-tui to 5.0.0-rc.1 to resolve ratatui version conflict (#1499)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2024-08-16 18:21:13 +08:00 • committed by GitHub
parent 374c6a8891
commit 99a3b3a043
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Cargo.lock generated
View file

@ -67,12 +67,14 @@ dependencies = [
[[package]] [[package]]
name = "ansi-to-tui" name = "ansi-to-tui"
version = "3.1.0" version = "5.0.0-rc.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b0e348dcd256ba06d44d5deabc88a7c0e80ee7303158253ca069bcd9e9b7f57" checksum = "428c2992b874104caf39204b05bf89eab4ceefdd4fcb26caa6759906f547f8e8"
dependencies = [ dependencies = [
"nom", "nom",
"ratatui", "ratatui",
"simdutf8",
"smallvec",
"thiserror", "thiserror",
] ]
@ -381,9 +383,9 @@ dependencies = [
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.15" version = "4.5.16"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11d8838454fda655dafd3accb2b6e2bea645b9e4078abe84a22ceb947235c5cc" checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
"clap_derive", "clap_derive",
@ -1280,9 +1282,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.155" version = "0.2.156"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a"
[[package]] [[package]]
name = "libfuzzer-sys" name = "libfuzzer-sys"
@ -2128,9 +2130,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.207" version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5665e14a49a4ea1b91029ba7d3bca9f299e1f7cfa194388ccc20f14743e784f2" checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -2147,9 +2149,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.207" version = "1.0.208"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6aea2634c86b0e8ef2cfdc0c340baede54ec27b1e46febd7f80dffb2aa44a00e" checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2249,6 +2251,12 @@ dependencies = [
"quote", "quote",
] ]
[[package]]
name = "simdutf8"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
[[package]] [[package]]
name = "slab" name = "slab"
version = "0.4.9" version = "0.4.9"

8
Cargo.toml
View file

@ -10,24 +10,24 @@ panic = "abort"
strip = true strip = true
[workspace.dependencies] [workspace.dependencies]
ansi-to-tui = "=3.1.0" ansi-to-tui = "5.0.0-rc.1"
anyhow = "1.0.86" anyhow = "1.0.86"
arc-swap = "1.7.1" arc-swap = "1.7.1"
base64 = "0.22.1" base64 = "0.22.1"
bitflags = "2.6.0" bitflags = "2.6.0"
clap = { version = "4.5.15", features = [ "derive" ] } clap = { version = "4.5.16", features = [ "derive" ] }
crossterm = { version = "0.27.0", features = [ "event-stream" ] } crossterm = { version = "0.27.0", features = [ "event-stream" ] }
dirs = "5.0.1" dirs = "5.0.1"
futures = "0.3.30" futures = "0.3.30"
globset = "0.4.14" globset = "0.4.14"
libc = "0.2.155" libc = "0.2.156"
md-5 = "0.10.6" md-5 = "0.10.6"
mlua = { version = "0.9.9", features = [ "lua54", "serialize", "macros", "async" ] } mlua = { version = "0.9.9", features = [ "lua54", "serialize", "macros", "async" ] }
parking_lot = "0.12.3" parking_lot = "0.12.3"
ratatui = "0.27.0" ratatui = "0.27.0"
regex = "1.10.6" regex = "1.10.6"
scopeguard = "1.2.0" scopeguard = "1.2.0"
serde = { version = "1.0.207", features = [ "derive" ] } serde = { version = "1.0.208", features = [ "derive" ] }
serde_json = "1.0.125" serde_json = "1.0.125"
shell-words = "1.1.0" shell-words = "1.1.0"
tokio = { version = "1.39.2", features = [ "full" ] } tokio = { version = "1.39.2", features = [ "full" ] }

3
scripts/build.sh
View file

@ -12,8 +12,7 @@ else
fi fi
# Build for the target # Build for the target
cargo build -p yazi-cli --release --locked --target "$1" cargo build --release --locked --target "$1"
cargo build -p yazi-fm --release --locked --target "$1"
# Create the artifact # Create the artifact
mkdir -p "$ARTIFACT_NAME/completions" mkdir -p "$ARTIFACT_NAME/completions"

2
yazi-adapter/src/chafa.rs
View file

@ -42,7 +42,7 @@ impl Chafa {
} }
let lines: Vec<_> = output.stdout.split(|&b| b == b'\n').collect(); let lines: Vec<_> = output.stdout.split(|&b| b == b'\n').collect();
let Ok(Some(first)) = lines[0].into_text().map(|mut t| t.lines.pop()) else { let Ok(Some(first)) = lines[0].to_text().map(|mut t| t.lines.pop()) else {
bail!("failed to parse chafa output"); bail!("failed to parse chafa output");
}; };

2
yazi-fs/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.3.1"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
authors = [ "sxyazi <sxyazi@gmail.com>" ] authors = [ "sxyazi <sxyazi@gmail.com>" ]
description = "Yazi File System" description = "Yazi file system"
homepage = "https://yazi-rs.github.io" homepage = "https://yazi-rs.github.io"
repository = "https://github.com/sxyazi/yazi" repository = "https://github.com/sxyazi/yazi"