From 048dcaca6d6f0ff31eb72bcb3ac531b2fea0c093 Mon Sep 17 00:00:00 2001 From: Gijs Burghoorn Date: Wed, 27 Sep 2023 20:42:09 +0200 Subject: [PATCH] Chore: cargo format --- src/config.rs | 1 - src/post_login/mod.rs | 8 ++++++-- src/post_login/x.rs | 17 ++++++++++------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/config.rs b/src/config.rs index f04e4ed..3484c49 100644 --- a/src/config.rs +++ b/src/config.rs @@ -340,7 +340,6 @@ toml_config_struct! { PasswordFieldConfig, PartialPasswordFieldConfig, RoughPass style => InputFieldStyle [PartialInputFieldStyle, RoughInputFieldStyle], } - toml_config_struct! { X11Config, PartialX11Config, RoughX11Config, x11_display => String, diff --git a/src/post_login/mod.rs b/src/post_login/mod.rs index 45240e2..c3918f5 100644 --- a/src/post_login/mod.rs +++ b/src/post_login/mod.rs @@ -165,7 +165,8 @@ impl PostLoginEnvironment { ShellLoginFlag::Long => Some("--login"), }; - let mut client = lower_command_permissions_to_user(Command::new(&config.system_shell), user_info); + let mut client = + lower_command_permissions_to_user(Command::new(&config.system_shell), user_info); let log_path = config.do_log.then_some(Path::new(&config.client_log_path)); @@ -277,7 +278,10 @@ pub fn get_envs(config: &Config) -> Vec<(String, PostLoginEnvironment)> { } } Err(_) => { - warn!("Failed to read from the X folder '{}'", config.x11.scripts_path); + warn!( + "Failed to read from the X folder '{}'", + config.x11.scripts_path + ); } } diff --git a/src/post_login/x.rs b/src/post_login/x.rs index 7976c9f..1789e56 100644 --- a/src/post_login/x.rs +++ b/src/post_login/x.rs @@ -141,11 +141,14 @@ pub fn setup_x( let mut child = Command::new(&config.system_shell); - let log_path = config.do_log.then_some(Path::new(&config.x11.xserver_log_path)); + let log_path = config + .do_log + .then_some(Path::new(&config.x11.xserver_log_path)); - child - .arg("-c") - .arg(format!("{} {display_value} vt{doubledigit_vtnr}", &config.x11.xserver_path)); + child.arg("-c").arg(format!( + "{} {display_value} vt{doubledigit_vtnr}", + &config.x11.xserver_path + )); let mut child = LemursChild::spawn(child, log_path).map_err(|err| { error!("Failed to start X server. Reason: {}", err); @@ -162,9 +165,9 @@ pub fn setup_x( let start_time = time::SystemTime::now(); loop { if config.x11.xserver_timeout_secs == 0 - || start_time - .elapsed() - .map_or(false, |t| t.as_secs() > config.x11.xserver_timeout_secs.into()) + || start_time.elapsed().map_or(false, |t| { + t.as_secs() > config.x11.xserver_timeout_secs.into() + }) { break; }