diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-07-28 12:05:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-28 12:05:38 +0200 |
| commit | 9969ed10b2cd95cb84ddaf8a783949483e2b038b (patch) | |
| tree | b8f6fe9a11e69440b6d9cb8ef56ee71c4d79fe9c /zellij-client | |
| parent | Nested session handling (#5417) (diff) | |
| download | sl0ppij-9969ed10b2cd95cb84ddaf8a783949483e2b038b.tar.gz sl0ppij-9969ed10b2cd95cb84ddaf8a783949483e2b038b.tar.xz sl0ppij-9969ed10b2cd95cb84ddaf8a783949483e2b038b.zip | |
Dep upgrades for debian (#5420)
* chore(deps): upgrade base64 0.22, colored 3.1, crossterm 0.29, dialoguer 0.11, directories 6.0, highway 1.2, prost 0.12.6, strip-ansi-escapes 0.2.1, suggest 0.5.1
* chore(deps): upgrade miette 7.6, nix 0.30, notify 8.2, notify-debouncer-full 0.5
* vte 0.15
* clap 4.6
* workspaceify plugin deps
* don't send empty fs watch events
Diffstat (limited to 'zellij-client')
| -rw-r--r-- | zellij-client/Cargo.toml | 3 | ||||
| -rw-r--r-- | zellij-client/src/remote_attach/mod.rs | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/zellij-client/Cargo.toml b/zellij-client/Cargo.toml index 70d313a2..3665ad3e 100644 --- a/zellij-client/Cargo.toml +++ b/zellij-client/Cargo.toml @@ -26,7 +26,6 @@ dialoguer = { workspace = true } interprocess = { workspace = true } lazy_static = { workspace = true } log = { workspace = true } -notify = { workspace = true } num_cpus = { workspace = true } regex = { workspace = true } serde = { workspace = true } @@ -53,7 +52,7 @@ signal-hook = { workspace = true } [target.'cfg(unix)'.dependencies] daemonize = { workspace = true } -nix = { workspace = true } +nix = { workspace = true, features = ["fs"] } [target.'cfg(windows)'.dependencies] crossterm = { workspace = true } diff --git a/zellij-client/src/remote_attach/mod.rs b/zellij-client/src/remote_attach/mod.rs index 99f8b92f..26228cfb 100644 --- a/zellij-client/src/remote_attach/mod.rs +++ b/zellij-client/src/remote_attach/mod.rs @@ -115,6 +115,12 @@ fn try_to_connect_with_saved_session_token( Ok(None) } +fn dialoguer_error_to_client_error(error: dialoguer::Error) -> RemoteClientError { + match error { + dialoguer::Error::IO(error) => RemoteClientError::IoError(error), + } +} + fn authenticate_with_retry( runtime: Handle, remote_session_url: &str, @@ -136,7 +142,7 @@ fn authenticate_with_retry( None => Password::new() .with_prompt("Enter authentication token") .interact() - .map_err(|e| RemoteClientError::IoError(e))?, + .map_err(dialoguer_error_to_client_error)?, }; let ca_cert_owned = ca_cert.map(|p| p.to_path_buf()); @@ -182,7 +188,7 @@ fn authenticate_with_retry( return Err(RemoteClientError::InvalidAuthToken); }, Err(e) => { - return Err(RemoteClientError::IoError(e)); + return Err(dialoguer_error_to_client_error(e)); }, } }, |