diff --git a/src/common/input/config.rs b/src/common/input/config.rs index 019d1c4c..5f2656f3 100644 --- a/src/common/input/config.rs +++ b/src/common/input/config.rs @@ -178,7 +178,10 @@ mod config_test { #[test] fn try_from_cli_args_with_option_clean() { let mut opts = CliArgs::default(); - opts.option = Some(ConfigCli::Config { clean: true }); + opts.option = Some(ConfigCli::Setup { + clean: true, + dump_config: false, + }); let result = Config::try_from(&opts); assert!(result.is_ok()); } diff --git a/src/common/screen.rs b/src/common/screen.rs index 82f63537..6f5a4cb3 100644 --- a/src/common/screen.rs +++ b/src/common/screen.rs @@ -4,10 +4,10 @@ use std::collections::BTreeMap; use std::os::unix::io::RawFd; use std::str; +use crate::cli::ConfigCli; +use crate::common::input::options::Options; use crate::common::pty::{PtyInstruction, VteBytes}; use crate::common::thread_bus::Bus; -use crate::common::input::options::Options; -use crate::cli::ConfigCli; use crate::errors::{ContextType, ScreenContext}; use crate::layout::Layout; use crate::panes::PaneId; @@ -16,7 +16,7 @@ use crate::server::ServerInstruction; use crate::tab::Tab; use crate::wasm_vm::PluginInstruction; -use zellij_tile::data::{Event, InputMode, ModeInfo, Palette, TabInfo, PluginCapabilities}; +use zellij_tile::data::{Event, InputMode, ModeInfo, Palette, PluginCapabilities, TabInfo}; /// Instructions that can be sent to the [`Screen`]. #[derive(Debug, Clone)] diff --git a/src/server/mod.rs b/src/server/mod.rs index 1b08f95f..d9875727 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -217,7 +217,13 @@ fn init_session( let options = opts.option; move || { - screen_thread_main(screen_bus, max_panes, full_screen_ws, options, config_options); + screen_thread_main( + screen_bus, + max_panes, + full_screen_ws, + options, + config_options, + ); } }) .unwrap();