diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-07-29 17:08:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-29 17:08:08 +0200 |
| commit | cab75c58fec089d7ee97c0e7ca1abafa9ef5e33f (patch) | |
| tree | 38b32141c6f27efd4eb2e19b6fd70834ce98ac4e /zellij-utils | |
| parent | Dep upgrades for debian (#5420) (diff) | |
| download | sl0ppij-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')
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 Binary files differindex 81896425..bd7e4726 100755 --- a/zellij-utils/assets/plugins/about.wasm +++ b/zellij-utils/assets/plugins/about.wasm diff --git a/zellij-utils/assets/plugins/compact-bar.wasm b/zellij-utils/assets/plugins/compact-bar.wasm Binary files differindex 3a22ab1b..a2a60e01 100755 --- a/zellij-utils/assets/plugins/compact-bar.wasm +++ b/zellij-utils/assets/plugins/compact-bar.wasm diff --git a/zellij-utils/assets/plugins/configuration.wasm b/zellij-utils/assets/plugins/configuration.wasm Binary files differindex 5163d569..0582ee5a 100755 --- a/zellij-utils/assets/plugins/configuration.wasm +++ b/zellij-utils/assets/plugins/configuration.wasm diff --git a/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm b/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm Binary files differindex 24170ee3..4862e3e9 100755 --- a/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm +++ b/zellij-utils/assets/plugins/fixture-plugin-for-tests.wasm diff --git a/zellij-utils/assets/plugins/layout-manager.wasm b/zellij-utils/assets/plugins/layout-manager.wasm Binary files differindex d4024b7b..5d76beb1 100755 --- a/zellij-utils/assets/plugins/layout-manager.wasm +++ b/zellij-utils/assets/plugins/layout-manager.wasm diff --git a/zellij-utils/assets/plugins/link.wasm b/zellij-utils/assets/plugins/link.wasm Binary files differindex dcb6ca24..d21bb78b 100755 --- a/zellij-utils/assets/plugins/link.wasm +++ b/zellij-utils/assets/plugins/link.wasm diff --git a/zellij-utils/assets/plugins/mobile.wasm b/zellij-utils/assets/plugins/mobile.wasm Binary files differindex 18232c41..77f02e30 100755 --- a/zellij-utils/assets/plugins/mobile.wasm +++ b/zellij-utils/assets/plugins/mobile.wasm diff --git a/zellij-utils/assets/plugins/multiple-select.wasm b/zellij-utils/assets/plugins/multiple-select.wasm Binary files differindex 091dcb3b..64ddfcd8 100755 --- a/zellij-utils/assets/plugins/multiple-select.wasm +++ b/zellij-utils/assets/plugins/multiple-select.wasm diff --git a/zellij-utils/assets/plugins/plugin-manager.wasm b/zellij-utils/assets/plugins/plugin-manager.wasm Binary files differindex 4ee57772..c5a9500f 100755 --- a/zellij-utils/assets/plugins/plugin-manager.wasm +++ b/zellij-utils/assets/plugins/plugin-manager.wasm diff --git a/zellij-utils/assets/plugins/session-manager.wasm b/zellij-utils/assets/plugins/session-manager.wasm Binary files differindex 8607887a..647dee4f 100755 --- a/zellij-utils/assets/plugins/session-manager.wasm +++ b/zellij-utils/assets/plugins/session-manager.wasm diff --git a/zellij-utils/assets/plugins/share.wasm b/zellij-utils/assets/plugins/share.wasm Binary files differindex b77919c3..b110c61a 100755 --- a/zellij-utils/assets/plugins/share.wasm +++ b/zellij-utils/assets/plugins/share.wasm diff --git a/zellij-utils/assets/plugins/status-bar.wasm b/zellij-utils/assets/plugins/status-bar.wasm Binary files differindex 33d8bb4c..64967a8e 100755 --- a/zellij-utils/assets/plugins/status-bar.wasm +++ b/zellij-utils/assets/plugins/status-bar.wasm diff --git a/zellij-utils/assets/plugins/strider.wasm b/zellij-utils/assets/plugins/strider.wasm Binary files differindex efc91d89..5fefd0af 100755 --- a/zellij-utils/assets/plugins/strider.wasm +++ b/zellij-utils/assets/plugins/strider.wasm diff --git a/zellij-utils/assets/plugins/tab-bar.wasm b/zellij-utils/assets/plugins/tab-bar.wasm Binary files differindex cd9ca086..3b1ea0f0 100755 --- a/zellij-utils/assets/plugins/tab-bar.wasm +++ b/zellij-utils/assets/plugins/tab-bar.wasm 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)> { |
