Fix Clippy Suggestions
This commit is contained in:
parent
197f318756
commit
dc067580f3
4 changed files with 10 additions and 7 deletions
|
|
@ -88,8 +88,8 @@ pub fn start_client(mut os_input: Box<dyn ClientOsApi>, opts: CliArgs, config: C
|
||||||
os_input.connect_to_server(&*ZELLIJ_IPC_PIPE);
|
os_input.connect_to_server(&*ZELLIJ_IPC_PIPE);
|
||||||
os_input.send_to_server(ClientToServerMsg::NewClient(
|
os_input.send_to_server(ClientToServerMsg::NewClient(
|
||||||
full_screen_ws,
|
full_screen_ws,
|
||||||
opts,
|
Box::new(opts),
|
||||||
config_options,
|
Box::new(config_options),
|
||||||
));
|
));
|
||||||
os_input.set_raw_mode(0);
|
os_input.set_raw_mode(0);
|
||||||
let _ = os_input
|
let _ = os_input
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ pub enum ClientToServerMsg {
|
||||||
DisconnectFromSession,*/
|
DisconnectFromSession,*/
|
||||||
ClientExit,
|
ClientExit,
|
||||||
TerminalResize(PositionAndSize),
|
TerminalResize(PositionAndSize),
|
||||||
NewClient(PositionAndSize, CliArgs, Options),
|
NewClient(PositionAndSize, Box<CliArgs>, Box<Options>),
|
||||||
Action(Action),
|
Action(Action),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -325,11 +325,14 @@ impl Screen {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The box is here in order to make the
|
||||||
|
// NewClient enum smaller
|
||||||
|
#[allow(clippy::boxed_local)]
|
||||||
pub fn screen_thread_main(
|
pub fn screen_thread_main(
|
||||||
bus: Bus<ScreenInstruction>,
|
bus: Bus<ScreenInstruction>,
|
||||||
max_panes: Option<usize>,
|
max_panes: Option<usize>,
|
||||||
full_screen_ws: PositionAndSize,
|
full_screen_ws: PositionAndSize,
|
||||||
config_options: Options,
|
config_options: Box<Options>,
|
||||||
) {
|
) {
|
||||||
let colors = bus.os_input.as_ref().unwrap().load_palette();
|
let colors = bus.os_input.as_ref().unwrap().load_palette();
|
||||||
let capabilities = config_options.simplified_ui;
|
let capabilities = config_options.simplified_ui;
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ use route::route_thread_main;
|
||||||
/// ones sent by client to server
|
/// ones sent by client to server
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub enum ServerInstruction {
|
pub enum ServerInstruction {
|
||||||
NewClient(PositionAndSize, CliArgs, Options),
|
NewClient(PositionAndSize, Box<CliArgs>, Box<Options>),
|
||||||
Render(Option<String>),
|
Render(Option<String>),
|
||||||
UnblockInputThread,
|
UnblockInputThread,
|
||||||
ClientExit,
|
ClientExit,
|
||||||
|
|
@ -186,8 +186,8 @@ pub fn start_server(os_input: Box<dyn ServerOsApi>, socket_path: PathBuf) {
|
||||||
|
|
||||||
fn init_session(
|
fn init_session(
|
||||||
os_input: Box<dyn ServerOsApi>,
|
os_input: Box<dyn ServerOsApi>,
|
||||||
opts: CliArgs,
|
opts: Box<CliArgs>,
|
||||||
config_options: Options,
|
config_options: Box<Options>,
|
||||||
to_server: SenderWithContext<ServerInstruction>,
|
to_server: SenderWithContext<ServerInstruction>,
|
||||||
full_screen_ws: PositionAndSize,
|
full_screen_ws: PositionAndSize,
|
||||||
) -> SessionMetaData {
|
) -> SessionMetaData {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue