From 7cc250180f61e0e4e8a5d0aa0271d31c3fc797b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E9=9B=85=20=C2=B7=20Misaki=20Masa?= Date: Thu, 10 Apr 2025 00:25:54 +0800 Subject: [PATCH] fix: reverse the mixing order of theme and flavor configuration (#2594) --- Cargo.lock | 49 +++++++++++++++++++++++++++++------------- scripts/build.sh | 2 +- scripts/bump.sh | 4 ++-- scripts/publish.sh | 2 ++ yazi-boot/Cargo.toml | 2 +- yazi-cli/Cargo.toml | 2 +- yazi-config/src/lib.rs | 2 +- yazi-dds/Cargo.toml | 2 +- 8 files changed, 43 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 35284d10..81e9122c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531a9155a481e2ee699d4f98f43c0ca4ff8ee1bfd55c31e9e98fb29d2b176fe0" +checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", "serde", @@ -507,9 +507,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -552,7 +552,7 @@ dependencies = [ "libc", "mio", "parking_lot", - "rustix", + "rustix 0.38.44", "signal-hook", "signal-hook-mio", "winapi", @@ -1259,6 +1259,12 @@ version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + [[package]] name = "lock_api" version = "0.4.12" @@ -1372,9 +1378,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" dependencies = [ "adler2", "simd-adler32", @@ -2062,7 +2068,20 @@ dependencies = [ "bitflags 2.9.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustix" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf" +dependencies = [ + "bitflags 2.9.0", + "errno", + "libc", + "linux-raw-sys 0.9.4", "windows-sys 0.59.0", ] @@ -2739,9 +2758,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "vergen" -version = "9.0.4" +version = "9.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d2f179f8075b805a43a2a21728a46f0cc2921b3c58695b28fa8817e103cd9a" +checksum = "6b2bf58be11fc9414104c6d3a2e464163db5ef74b12296bda593cac37b6e4777" dependencies = [ "anyhow", "derive_builder", @@ -2753,9 +2772,9 @@ dependencies = [ [[package]] name = "vergen-gitcl" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2f89d70a58a4506a6079cedf575c64cf51649ccbb4e02a63dac539b264b7711" +checksum = "92ee058141ff0fab661d1e2837d1cf0fe1ac6173cf46224e25cec21e780eb5cc" dependencies = [ "anyhow", "derive_builder", @@ -2879,13 +2898,13 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "which" -version = "7.0.2" +version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2774c861e1f072b3aadc02f8ba886c26ad6321567ecc294c935434cad06f1283" +checksum = "24d643ce3fd3e5b54854602a080f34fb10ab75e0b813ee32d00ca2b44fa74762" dependencies = [ "either", "env_home", - "rustix", + "rustix 1.0.5", "winsafe", ] diff --git a/scripts/build.sh b/scripts/build.sh index bc6a7ea0..86c33b76 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail export ARTIFACT_NAME="yazi-$1" diff --git a/scripts/bump.sh b/scripts/bump.sh index 9db4b58b..efbfd1c8 100755 --- a/scripts/bump.sh +++ b/scripts/bump.sh @@ -1,8 +1,8 @@ -#!/bin/bash +#!/usr/bin/env bash set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -cd $SCRIPT_DIR/.. +cd "$SCRIPT_DIR/.." echo "Bumping version: $1" diff --git a/scripts/publish.sh b/scripts/publish.sh index 7cd26c66..72cd7ea1 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + cargo publish -p yazi-macro && sleep 30 cargo publish -p yazi-codegen && sleep 30 cargo publish -p yazi-shared && sleep 30 diff --git a/yazi-boot/Cargo.toml b/yazi-boot/Cargo.toml index fb946bfe..1577fd22 100644 --- a/yazi-boot/Cargo.toml +++ b/yazi-boot/Cargo.toml @@ -28,4 +28,4 @@ clap = { workspace = true } clap_complete = "4.5.47" clap_complete_fig = "4.5.2" clap_complete_nushell = "4.5.5" -vergen-gitcl = { version = "1.0.5", features = [ "build", "rustc" ] } +vergen-gitcl = { version = "1.0.7", features = [ "build", "rustc" ] } diff --git a/yazi-cli/Cargo.toml b/yazi-cli/Cargo.toml index 10fffd0e..5f9bf38b 100644 --- a/yazi-cli/Cargo.toml +++ b/yazi-cli/Cargo.toml @@ -35,7 +35,7 @@ clap_complete = "4.5.47" clap_complete_fig = "4.5.2" clap_complete_nushell = "4.5.5" serde_json = { workspace = true } -vergen-gitcl = { version = "1.0.5", features = [ "build" ] } +vergen-gitcl = { version = "1.0.7", features = [ "build" ] } [target.'cfg(target_os = "macos")'.dependencies] crossterm = { workspace = true, features = [ "use-dev-tty", "libc" ] } diff --git a/yazi-config/src/lib.rs b/yazi-config/src/lib.rs index 6493f9ee..2649a490 100644 --- a/yazi-config/src/lib.rs +++ b/yazi-config/src/lib.rs @@ -57,8 +57,8 @@ fn try_init_flavor(light: bool, merge: bool) -> anyhow::Result<()> { ))?; let flavor = shadow.flavor.as_ref().map(theme::Flavor::from).unwrap_or_default().read(light)?; - theme = theme.deserialize_over_with::(shadow)?; theme = theme.deserialize_over(toml::Deserializer::new(&flavor))?; + theme = theme.deserialize_over_with::(shadow)?; } THEME.init(theme.reshape(light)?); diff --git a/yazi-dds/Cargo.toml b/yazi-dds/Cargo.toml index bdce12cc..286830be 100644 --- a/yazi-dds/Cargo.toml +++ b/yazi-dds/Cargo.toml @@ -31,7 +31,7 @@ tokio-util = { workspace = true } tracing = { workspace = true } [build-dependencies] -vergen-gitcl = { version = "1.0.5", features = [ "build" ] } +vergen-gitcl = { version = "1.0.7", features = [ "build" ] } [target."cfg(unix)".dependencies] uzers = { workspace = true }