From fdb8774bfd9f1dfcb8aefd790616dc52617bf2fb Mon Sep 17 00:00:00 2001 From: epi Date: Mon, 4 Apr 2022 06:17:32 -0500 Subject: [PATCH] removed unnecessary async --- src/scan_manager/menu.rs | 2 +- src/scan_manager/scan_container.rs | 2 +- src/scan_manager/tests.rs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/scan_manager/menu.rs b/src/scan_manager/menu.rs index 8d67891..ae0884a 100644 --- a/src/scan_manager/menu.rs +++ b/src/scan_manager/menu.rs @@ -202,7 +202,7 @@ impl Menu { } /// get input from the user and translate it to a `MenuCmd` - pub(super) async fn get_command_input_from_user(&self, line: &str) -> Option { + pub(super) fn get_command_input_from_user(&self, line: &str) -> Option { let line = line.trim(); // normalize input if there are leading spaces match line.chars().next().unwrap_or('_').to_ascii_lowercase() { diff --git a/src/scan_manager/scan_container.rs b/src/scan_manager/scan_container.rs index 4fd1131..f874bfd 100644 --- a/src/scan_manager/scan_container.rs +++ b/src/scan_manager/scan_container.rs @@ -381,7 +381,7 @@ impl FeroxScans { self.menu.print_footer(); let menu_cmd = if let Ok(line) = self.menu.term.read_line() { - self.menu.get_command_input_from_user(&line).await + self.menu.get_command_input_from_user(&line) } else { None }; diff --git a/src/scan_manager/tests.rs b/src/scan_manager/tests.rs index 503ecdc..240d7ca 100644 --- a/src/scan_manager/tests.rs +++ b/src/scan_manager/tests.rs @@ -625,7 +625,7 @@ async fn menu_get_command_input_from_user_returns_cancel() { format!("{} {}\n", cmd, idx) }; - let result = menu.get_command_input_from_user(&full_cmd).await.unwrap(); + let result = menu.get_command_input_from_user(&full_cmd).unwrap(); assert!(matches!(result, MenuCmd::Cancel(_, _))); @@ -650,14 +650,14 @@ async fn menu_get_command_input_from_user_returns_add() { let full_cmd = format!("{} {}\n", cmd, test_url); if cmd != "None" { - let result = menu.get_command_input_from_user(&full_cmd).await.unwrap(); + let result = menu.get_command_input_from_user(&full_cmd).unwrap(); assert!(matches!(result, MenuCmd::Add(_))); if let MenuCmd::Add(url) = result { assert_eq!(url, test_url); } } else { - assert!(menu.get_command_input_from_user(&full_cmd).await.is_none()); + assert!(menu.get_command_input_from_user(&full_cmd).is_none()); }; } }