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-utils/src/input/options.rs | |
| 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-utils/src/input/options.rs')
| -rw-r--r-- | zellij-utils/src/input/options.rs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/zellij-utils/src/input/options.rs b/zellij-utils/src/input/options.rs index 194ab24c..6c07fd7d 100644 --- a/zellij-utils/src/input/options.rs +++ b/zellij-utils/src/input/options.rs @@ -1,14 +1,14 @@ //! Handles cli and configuration options use crate::cli::Command; use crate::data::{InputMode, WebSharing}; -use clap::{ArgEnum, Args}; +use clap::{Args, ValueEnum}; use serde::{Deserialize, Serialize}; use std::path::PathBuf; use std::str::FromStr; use std::net::IpAddr; -#[derive(Copy, Clone, Debug, PartialEq, Deserialize, Serialize, ArgEnum)] +#[derive(Copy, Clone, Debug, PartialEq, Deserialize, Serialize, ValueEnum)] pub enum OnForceClose { #[serde(alias = "quit")] Quit, @@ -16,7 +16,7 @@ pub enum OnForceClose { Detach, } -#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, Serialize, ArgEnum)] +#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, Serialize, ValueEnum)] pub enum MobileLayoutConfiguration { #[serde(alias = "web")] Web, @@ -75,7 +75,7 @@ impl MobileLayoutConfiguration { } } -#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, Serialize, ArgEnum)] +#[derive(Copy, Clone, Debug, PartialEq, Eq, Deserialize, Serialize, ValueEnum)] pub enum NestedSessionHandling { #[serde(alias = "ask")] Ask, @@ -124,7 +124,7 @@ impl FromStr for OnForceClose { } } -#[derive(ArgEnum, Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)] +#[derive(ValueEnum, Clone, Copy, Debug, PartialEq, Eq, Deserialize, Serialize)] #[serde(rename_all = "lowercase")] pub enum PaneFrameStyle { Full, @@ -199,7 +199,7 @@ pub struct Options { #[clap(long, value_parser)] pub theme_light: Option<String>, /// Set the default mode - #[clap(long, arg_enum, hide_possible_values = true, value_parser)] + #[clap(long, value_enum, hide_possible_values = true, value_parser)] pub default_mode: Option<InputMode>, /// Set the default shell #[clap(long, value_parser)] @@ -227,7 +227,7 @@ pub struct Options { #[serde(default)] /// Set display of the pane frames (true or false) pub pane_frames: Option<bool>, - #[clap(long, arg_enum, hide_possible_values = true, value_parser)] + #[clap(long, value_enum, hide_possible_values = true, value_parser)] #[serde(default)] pub pane_frame_style: Option<PaneFrameStyle>, #[clap(long, value_parser)] @@ -235,7 +235,7 @@ pub struct Options { /// Mirror session when multiple users are connected (true or false) pub mirror_session: Option<bool>, /// Set behaviour on force close (quit or detach) - #[clap(long, arg_enum, hide_possible_values = true, value_parser)] + #[clap(long, value_enum, hide_possible_values = true, value_parser)] pub on_force_close: Option<OnForceClose>, #[clap(long, value_parser)] pub scroll_buffer_size: Option<usize>, @@ -248,9 +248,9 @@ pub struct Options { /// OSC52 destination clipboard #[clap( long, - arg_enum, + value_enum, ignore_case = true, - conflicts_with = "copy-command", + conflicts_with = "copy_command", value_parser )] #[serde(default)] @@ -433,7 +433,7 @@ pub struct Options { pub client_async_worker_tasks: Option<usize>, /// When a newly-attaching client should land in the mobile UI plugin (web, always, never) - #[clap(long, arg_enum, hide_possible_values = true, value_parser)] + #[clap(long, value_enum, hide_possible_values = true, value_parser)] #[serde(default)] pub mobile_layout: Option<MobileLayoutConfiguration>, @@ -449,12 +449,12 @@ pub struct Options { /// How to handle a nested Zellij session detected inside a pane /// (ask, fullscreen, descend, never) - #[clap(long, arg_enum, hide_possible_values = true, value_parser)] + #[clap(long, value_enum, hide_possible_values = true, value_parser)] #[serde(default)] pub nested_session_handling: Option<NestedSessionHandling>, } -#[derive(ArgEnum, Deserialize, Serialize, Debug, Clone, Copy, PartialEq)] +#[derive(ValueEnum, Deserialize, Serialize, Debug, Clone, Copy, PartialEq)] pub enum Clipboard { #[serde(alias = "system")] System, |
