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 /src/commands.rs | |
| 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 'src/commands.rs')
| -rw-r--r-- | src/commands.rs | 79 |
1 files changed, 2 insertions, 77 deletions
diff --git a/src/commands.rs b/src/commands.rs index bc561a75..fb53ad93 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,16 +1,12 @@ use dialoguer::Confirm; use std::net::IpAddr; -use std::{fs::File, io::prelude::*, path::PathBuf, process, time::Duration}; +use std::{path::PathBuf, process, time::Duration}; #[cfg(feature = "web_server_capability")] use isahc::{config::RedirectPolicy, prelude::*, HttpClient, Request}; use zellij_client::{ - old_config_converter::{ - config_yaml_to_config_kdl, convert_old_yaml_files, layout_yaml_to_layout_kdl, - }, - os_input_output::get_client_os_input, - start_client as start_client_impl, ClientInfo, + os_input_output::get_client_os_input, start_client as start_client_impl, ClientInfo, }; use zellij_utils::sessions::{ @@ -511,75 +507,6 @@ pub(crate) fn subscribe_to_session( ); } -pub(crate) fn convert_old_config_file(old_config_file: PathBuf) { - match File::open(&old_config_file) { - Ok(mut handle) => { - let mut raw_config_file = String::new(); - let _ = handle.read_to_string(&mut raw_config_file); - match config_yaml_to_config_kdl(&raw_config_file, false) { - Ok(kdl_config) => { - println!("{}", kdl_config); - process::exit(0); - }, - Err(e) => { - eprintln!("Failed to convert config: {}", e); - process::exit(1); - }, - } - }, - Err(e) => { - eprintln!("Failed to open file: {}", e); - process::exit(1); - }, - } -} - -pub(crate) fn convert_old_layout_file(old_layout_file: PathBuf) { - match File::open(&old_layout_file) { - Ok(mut handle) => { - let mut raw_layout_file = String::new(); - let _ = handle.read_to_string(&mut raw_layout_file); - match layout_yaml_to_layout_kdl(&raw_layout_file) { - Ok(kdl_layout) => { - println!("{}", kdl_layout); - process::exit(0); - }, - Err(e) => { - eprintln!("Failed to convert layout: {}", e); - process::exit(1); - }, - } - }, - Err(e) => { - eprintln!("Failed to open file: {}", e); - process::exit(1); - }, - } -} - -pub(crate) fn convert_old_theme_file(old_theme_file: PathBuf) { - match File::open(&old_theme_file) { - Ok(mut handle) => { - let mut raw_config_file = String::new(); - let _ = handle.read_to_string(&mut raw_config_file); - match config_yaml_to_config_kdl(&raw_config_file, true) { - Ok(kdl_config) => { - println!("{}", kdl_config); - process::exit(0); - }, - Err(e) => { - eprintln!("Failed to convert config: {}", e); - process::exit(1); - }, - } - }, - Err(e) => { - eprintln!("Failed to open file: {}", e); - process::exit(1); - }, - } -} - fn attach_with_cli_client( cli_action: zellij_utils::cli::CliAction, session_name: &str, @@ -683,8 +610,6 @@ fn attach_with_session_name( } pub(crate) fn start_client(opts: CliArgs) { - // look for old YAML config/layout/theme files and convert them to KDL - convert_old_yaml_files(&opts); let ( config, client_layout_info, |
