aboutsummaryrefslogtreecommitdiffstats
path: root/zellij-utils
diff options
context:
space:
mode:
authorAram Drevekenin <aram@poor.dev>2026-07-29 17:08:08 +0200
committerGitHub <noreply@github.com>2026-07-29 17:08:08 +0200
commitcab75c58fec089d7ee97c0e7ca1abafa9ef5e33f (patch)
tree38b32141c6f27efd4eb2e19b6fd70834ce98ac4e /zellij-utils
parentDep upgrades for debian (#5420) (diff)
downloadsl0ppij-cab75c58fec089d7ee97c0e7ca1abafa9ef5e33f.tar.gz
sl0ppij-cab75c58fec089d7ee97c0e7ca1abafa9ef5e33f.tar.xz
sl0ppij-cab75c58fec089d7ee97c0e7ca1abafa9ef5e33f.zip
More dependency upgrades for debian (#5421)
* upgrade insta, rand, sha2, strum, thiserror, tokio-tungstenite, toml, which; drop unused semver and typetag * upgrade sysinfo to 0.39.5, bump toolchain (msrv) to 1.95.0 * remote legacy yaml config converter and thus drop serde_yaml * upgrade unicode-width to 0.2.2 * fix(tests): run ipc roundtrip test on a larger stack
Diffstat (limited to 'zellij-utils')
-rw-r--r--zellij-utils/Cargo.toml2
-rwxr-xr-xzellij-utils/assets/plugins/about.wasmbin1507037 -> 1433058 bytes
-rwxr-xr-xzellij-utils/assets/plugins/compact-bar.wasmbin1716026 -> 1638203 bytes
-rwxr-xr-xzellij-utils/assets/plugins/configuration.wasmbin1564825 -> 1500689 bytes
-rwxr-xr-xzellij-utils/assets/plugins/fixture-plugin-for-tests.wasmbin1658937 -> 1579927 bytes
-rwxr-xr-xzellij-utils/assets/plugins/layout-manager.wasmbin1844118 -> 1772526 bytes
-rwxr-xr-xzellij-utils/assets/plugins/link.wasmbin1289926 -> 1221717 bytes
-rwxr-xr-xzellij-utils/assets/plugins/mobile.wasmbin1583341 -> 1515883 bytes
-rwxr-xr-xzellij-utils/assets/plugins/multiple-select.wasmbin1505503 -> 1424907 bytes
-rwxr-xr-xzellij-utils/assets/plugins/plugin-manager.wasmbin1465068 -> 1399712 bytes
-rwxr-xr-xzellij-utils/assets/plugins/session-manager.wasmbin1691782 -> 1631806 bytes
-rwxr-xr-xzellij-utils/assets/plugins/share.wasmbin1462013 -> 1391492 bytes
-rwxr-xr-xzellij-utils/assets/plugins/status-bar.wasmbin1665402 -> 1570745 bytes
-rwxr-xr-xzellij-utils/assets/plugins/strider.wasmbin1671053 -> 1602684 bytes
-rwxr-xr-xzellij-utils/assets/plugins/tab-bar.wasmbin1734350 -> 1655598 bytes
-rw-r--r--zellij-utils/src/cli.rs9
-rw-r--r--zellij-utils/src/errors.rs2
-rw-r--r--zellij-utils/src/ipc/tests/roundtrip_tests.rs13
-rw-r--r--zellij-utils/src/web_authentication_tokens.rs6
19 files changed, 18 insertions, 14 deletions
diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
index 72037a66..efc76d77 100644
--- a/zellij-utils/Cargo.toml
+++ b/zellij-utils/Cargo.toml
@@ -69,7 +69,7 @@ winapi = { version = "0.3.9", default-features = false }
dunce = "1.0"
[dev-dependencies]
-insta = { version = "1.6.0", features = ["backtrace"] }
+insta = "1.48"
expect-test = "1.4.1"
[features]
diff --git a/zellij-utils/assets/plugins/about.wasm b/zellij-utils/assets/plugins/about.wasm
index 81896425..bd7e4726 100755
--- a/zellij-utils/assets/plugins/about.wasm
+++ b/zellij-utils/assets/plugins/about.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/compact-bar.wasm b/zellij-utils/assets/plugins/compact-bar.wasm
index 3a22ab1b..a2a60e01 100755
--- a/zellij-utils/assets/plugins/compact-bar.wasm
+++ b/zellij-utils/assets/plugins/compact-bar.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/configuration.wasm b/zellij-utils/assets/plugins/configuration.wasm
index 5163d569..0582ee5a 100755
--- a/zellij-utils/assets/plugins/configuration.wasm
+++ b/zellij-utils/assets/plugins/configuration.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm b/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm
index 24170ee3..4862e3e9 100755
--- a/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm
+++ b/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/layout-manager.wasm b/zellij-utils/assets/plugins/layout-manager.wasm
index d4024b7b..5d76beb1 100755
--- a/zellij-utils/assets/plugins/layout-manager.wasm
+++ b/zellij-utils/assets/plugins/layout-manager.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/link.wasm b/zellij-utils/assets/plugins/link.wasm
index dcb6ca24..d21bb78b 100755
--- a/zellij-utils/assets/plugins/link.wasm
+++ b/zellij-utils/assets/plugins/link.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/mobile.wasm b/zellij-utils/assets/plugins/mobile.wasm
index 18232c41..77f02e30 100755
--- a/zellij-utils/assets/plugins/mobile.wasm
+++ b/zellij-utils/assets/plugins/mobile.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/multiple-select.wasm b/zellij-utils/assets/plugins/multiple-select.wasm
index 091dcb3b..64ddfcd8 100755
--- a/zellij-utils/assets/plugins/multiple-select.wasm
+++ b/zellij-utils/assets/plugins/multiple-select.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/plugin-manager.wasm b/zellij-utils/assets/plugins/plugin-manager.wasm
index 4ee57772..c5a9500f 100755
--- a/zellij-utils/assets/plugins/plugin-manager.wasm
+++ b/zellij-utils/assets/plugins/plugin-manager.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/session-manager.wasm b/zellij-utils/assets/plugins/session-manager.wasm
index 8607887a..647dee4f 100755
--- a/zellij-utils/assets/plugins/session-manager.wasm
+++ b/zellij-utils/assets/plugins/session-manager.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/share.wasm b/zellij-utils/assets/plugins/share.wasm
index b77919c3..b110c61a 100755
--- a/zellij-utils/assets/plugins/share.wasm
+++ b/zellij-utils/assets/plugins/share.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/status-bar.wasm b/zellij-utils/assets/plugins/status-bar.wasm
index 33d8bb4c..64967a8e 100755
--- a/zellij-utils/assets/plugins/status-bar.wasm
+++ b/zellij-utils/assets/plugins/status-bar.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/strider.wasm b/zellij-utils/assets/plugins/strider.wasm
index efc91d89..5fefd0af 100755
--- a/zellij-utils/assets/plugins/strider.wasm
+++ b/zellij-utils/assets/plugins/strider.wasm
Binary files differ
diff --git a/zellij-utils/assets/plugins/tab-bar.wasm b/zellij-utils/assets/plugins/tab-bar.wasm
index cd9ca086..3b1ea0f0 100755
--- a/zellij-utils/assets/plugins/tab-bar.wasm
+++ b/zellij-utils/assets/plugins/tab-bar.wasm
Binary files differ
diff --git a/zellij-utils/src/cli.rs b/zellij-utils/src/cli.rs
index 7cc5877c..96372e71 100644
--- a/zellij-utils/src/cli.rs
+++ b/zellij-utils/src/cli.rs
@@ -640,15 +640,6 @@ pub enum Sessions {
)]
tab_id: Option<usize>,
},
- ConvertConfig {
- old_config_file: PathBuf,
- },
- ConvertLayout {
- old_layout_file: PathBuf,
- },
- ConvertTheme {
- old_theme_file: PathBuf,
- },
/// Send data to one or more plugins, launch them if they are not running.
#[clap(override_usage(
r#"
diff --git a/zellij-utils/src/errors.rs b/zellij-utils/src/errors.rs
index ae2cc239..24987179 100644
--- a/zellij-utils/src/errors.rs
+++ b/zellij-utils/src/errors.rs
@@ -772,7 +772,7 @@ mod not_wasm {
const MAX_THREAD_CALL_STACK: usize = 6;
#[derive(Debug, ThisError, Diagnostic)]
- #[error("{0}{}", self.show_backtrace())]
+ #[error("{0}{backtrace}", backtrace = self.show_backtrace())]
#[diagnostic(help("{}", self.show_help()))]
struct Panic(String);
diff --git a/zellij-utils/src/ipc/tests/roundtrip_tests.rs b/zellij-utils/src/ipc/tests/roundtrip_tests.rs
index f8e6dc91..e441092a 100644
--- a/zellij-utils/src/ipc/tests/roundtrip_tests.rs
+++ b/zellij-utils/src/ipc/tests/roundtrip_tests.rs
@@ -26,10 +26,19 @@ use crate::position::Position;
use std::collections::{BTreeMap, BTreeSet};
use std::path::PathBuf;
+const ROUNDTRIP_TEST_STACK_SIZE: usize = 32 * 1024 * 1024;
+
#[test]
fn server_client_contract() {
- test_client_messages();
- test_server_messages();
+ std::thread::Builder::new()
+ .stack_size(ROUNDTRIP_TEST_STACK_SIZE)
+ .spawn(|| {
+ test_client_messages();
+ test_server_messages();
+ })
+ .expect("failed to spawn roundtrip test thread")
+ .join()
+ .expect("roundtrip test thread panicked");
}
fn test_client_messages() {
diff --git a/zellij-utils/src/web_authentication_tokens.rs b/zellij-utils/src/web_authentication_tokens.rs
index b579890f..7e0deabf 100644
--- a/zellij-utils/src/web_authentication_tokens.rs
+++ b/zellij-utils/src/web_authentication_tokens.rs
@@ -136,7 +136,11 @@ fn init_db(conn: &Connection) -> Result<()> {
pub fn hash_token(token: &str) -> String {
let mut hasher = Sha256::new();
hasher.update(token.as_bytes());
- format!("{:x}", hasher.finalize())
+ hasher
+ .finalize()
+ .iter()
+ .map(|byte| format!("{:02x}", byte))
+ .collect()
}
pub fn create_token(name: Option<String>, read_only: bool) -> Result<(String, String)> {