diff options
| author | Aram Drevekenin <aram@poor.dev> | 2026-03-16 10:37:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-16 10:37:45 +0100 |
| commit | 91e7297b6397fd52d4ff995bdff1fa124a5acf81 (patch) | |
| tree | 6420aa5a8ee3e47938dfdf39533e89a7236fc728 /zellij-client | |
| parent | Ansi dump support (#4848) (diff) | |
| download | sl0ppij-91e7297b6397fd52d4ff995bdff1fa124a5acf81.tar.gz sl0ppij-91e7297b6397fd52d4ff995bdff1fa124a5acf81.tar.xz sl0ppij-91e7297b6397fd52d4ff995bdff1fa124a5acf81.zip | |
Warning and duplication cleanups (#4857)
* cleanup compilation warnings
* consolidate EditScrollbackRaw into EditScrollback
Diffstat (limited to 'zellij-client')
| -rw-r--r-- | zellij-client/src/cli_client.rs | 2 | ||||
| -rw-r--r-- | zellij-client/src/lib.rs | 1 | ||||
| -rw-r--r-- | zellij-client/src/web_client/mod.rs | 1 | ||||
| -rw-r--r-- | zellij-client/src/web_client/types.rs | 5 | ||||
| -rw-r--r-- | zellij-client/src/web_client/unit/web_client_tests.rs | 6 |
5 files changed, 7 insertions, 8 deletions
diff --git a/zellij-client/src/cli_client.rs b/zellij-client/src/cli_client.rs index fa302368..83f9e607 100644 --- a/zellij-client/src/cli_client.rs +++ b/zellij-client/src/cli_client.rs @@ -246,7 +246,7 @@ fn individual_messages_client( } pub fn start_subscribe_client( - mut os_input: Box<dyn ClientOsApi>, + os_input: Box<dyn ClientOsApi>, session_name: &str, subscribe_cli: SubscribeCli, ) { diff --git a/zellij-client/src/lib.rs b/zellij-client/src/lib.rs index 294c4139..95a0810f 100644 --- a/zellij-client/src/lib.rs +++ b/zellij-client/src/lib.rs @@ -342,6 +342,7 @@ impl ClientInfo { pub(crate) enum InputInstruction { KeyEvent(InputEvent, Vec<u8>), KeyWithModifierEvent(KeyWithModifier, Vec<u8>, bool), // bool = is_kitty_keyboard_protocol + #[allow(dead_code)] // constructed in stdin_handler_windows.rs (Windows-only) MouseEvent(zellij_utils::input::mouse::MouseEvent), AnsiStdinInstructions(Vec<AnsiStdinInstruction>), StartedParsing, diff --git a/zellij-client/src/web_client/mod.rs b/zellij-client/src/web_client/mod.rs index ef6f6b49..b63e066f 100644 --- a/zellij-client/src/web_client/mod.rs +++ b/zellij-client/src/web_client/mod.rs @@ -54,6 +54,7 @@ use utils::should_use_https; use uuid::Uuid; use websocket_handlers::{ws_handler_control, ws_handler_terminal}; +#[allow(dead_code)] // used in #[cfg(not(unix))] code path const DEFAULT_SERVER_STARTUP_TIMEOUT_SECS: u64 = 10; pub fn start_web_client( diff --git a/zellij-client/src/web_client/types.rs b/zellij-client/src/web_client/types.rs index 18f3d155..02f80333 100644 --- a/zellij-client/src/web_client/types.rs +++ b/zellij-client/src/web_client/types.rs @@ -1,10 +1,7 @@ use axum::extract::ws::Message; use serde::{Deserialize, Serialize}; use std::collections::HashMap; -use std::sync::{ - atomic::{AtomicBool, Ordering}, - Arc, Mutex, -}; +use std::sync::{atomic::AtomicBool, Arc, Mutex}; use tokio::sync::mpsc::UnboundedSender; use tokio_util::sync::CancellationToken; diff --git a/zellij-client/src/web_client/unit/web_client_tests.rs b/zellij-client/src/web_client/unit/web_client_tests.rs index 2ea2982a..c2b80948 100644 --- a/zellij-client/src/web_client/unit/web_client_tests.rs +++ b/zellij-client/src/web_client/unit/web_client_tests.rs @@ -8,7 +8,6 @@ use std::sync::{Arc, Mutex}; use tokio::time::timeout; use tokio_tungstenite::tungstenite::http::Request; use tokio_tungstenite::{connect_async, tungstenite::Message}; -use zellij_utils::input::cli_assets::CliAssets; use zellij_utils::input::layout::Layout; use zellij_utils::{consts::VERSION, input::config::Config, input::options::Options}; @@ -19,9 +18,9 @@ use crate::web_client::control_message::{ }; use crate::web_client::ClientOsApiFactory; use zellij_utils::{ - data::{LayoutInfo, Palette}, + data::Palette, errors::ErrorContext, - ipc::{ClientAttributes, ClientToServerMsg, ServerToClientMsg}, + ipc::{ClientToServerMsg, ServerToClientMsg}, pane_size::Size, web_authentication_tokens::{create_token, delete_db, revoke_token}, }; @@ -2662,6 +2661,7 @@ impl MockSessionManager { } } + #[allow(dead_code)] pub fn get_first_message_for_session(&self, session_name: &str) -> Option<ClientToServerMsg> { self.first_messages_sent .lock() |
