From 8db6ae4866b11f3cf168ec8c1c090d889cb6523a Mon Sep 17 00:00:00 2001 From: fdai7375 Date: Thu, 2 Feb 2023 19:03:10 +0100 Subject: [PATCH] refactoring: fix clippy warnings inside the split_command function --- src/builtins/help.rs | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/src/builtins/help.rs b/src/builtins/help.rs index 1e54065..5608cef 100644 --- a/src/builtins/help.rs +++ b/src/builtins/help.rs @@ -1,6 +1,6 @@ -use colored::Colorize; use crate::builtins::{Builtin, BuiltinConfig}; use crate::error::ShellError; +use colored::Colorize; pub struct Help; @@ -21,18 +21,22 @@ impl Builtin for Help { "; for line in commands.lines() { - println!("{}{}", split_command(line)[0].bold(), split_command(line)[1]); + println!( + "{}{}", + split_command(line)[0].bold(), + split_command(line)[1] + ); } Ok(()) } } fn split_command(commands: &str) -> Vec<&str> { - if commands.trim_start().len() >= 1 { - let splitted_command = commands.trim_start().splitn(2, " ").collect(); + if !commands.trim_start().is_empty() { + let splitted_command = commands.trim_start().splitn(2, ' ').collect(); return splitted_command; } - return vec!["", ""]; + vec!["", ""] } #[cfg(test)] @@ -42,13 +46,22 @@ mod tests { #[test] fn test_split_command_split() { let test_string1 = "Hallo, Marcel Davis 1&1."; - assert_eq!(split_command(test_string1), vec!["Hallo,", "Marcel Davis 1&1."]); + assert_eq!( + split_command(test_string1), + vec!["Hallo,", "Marcel Davis 1&1."] + ); let test_string2 = "Leiter1 23für Kundenzufriedenheit."; - assert_eq!(split_command(test_string2), vec!["Leiter1", "23für Kundenzufriedenheit."]); + assert_eq!( + split_command(test_string2), + vec!["Leiter1", "23für Kundenzufriedenheit."] + ); let test_string3 = "Wir# $%gehen erst wieder, wenn ihre Leitung läuft!"; - assert_eq!(split_command(test_string3), vec!["Wir#", "$%gehen erst wieder, wenn ihre Leitung läuft!"]); + assert_eq!( + split_command(test_string3), + vec!["Wir#", "$%gehen erst wieder, wenn ihre Leitung läuft!"] + ); } #[test] @@ -60,4 +73,4 @@ mod tests { fn test_split_command_only_space() { assert_eq!(split_command(" "), vec!["", ""]); } -} \ No newline at end of file +}