Merge pull request #10 from icanvardar/refactor/basic

refactor: update modules according to clippy suggestions
icanvardar · Nov 4, 2024 · 3a9a9aa · 3a9a9aa
2 parents fdbd8a9 + 5e753e7
commit 3a9a9aa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 31 deletions.
diff --git a/src/common/app_builder.rs b/src/common/app_builder.rs
@@ -1,4 +1,4 @@
-use std::{error::Error, pin::Pin};
+use std::error::Error;
 
 use clap::Parser;
 
@@ -23,30 +23,23 @@ pub struct Args {
     output: Option<String>,
 }
 
-pub trait AppBuilder {
-    fn build() -> Pin<Box<dyn core::future::Future<Output = Result<Arbor, Box<dyn Error>>> + Send>>
+impl Arbor {
+    pub async fn build() -> Result<Arbor, Box<dyn Error>>
     where
         Self: Sync,
     {
-        Box::pin(async move {
-            let args = Args::parse();
-
-            let output = if let Some(ref o) = args.output {
-                Some(o.as_str())
-            } else {
-                None
-            };
-
-            Ok(Arbor {
-                autocomplete: Autocomplete::build(
-                    args.language.clone(),
-                    args.thread_count,
-                    args.max_suggestion,
-                    args.backup,
-                    output,
-                )
-                .await?,
-            })
+        let args = Args::parse();
+        let output = args.output.as_deref();
+
+        Ok(Arbor {
+            autocomplete: Autocomplete::build(
+                args.language.clone(),
+                args.thread_count,
+                args.max_suggestion,
+                args.backup,
+                output,
+            )
+            .await?,
         })
     }
 }
@@ -55,8 +48,6 @@ pub struct Arbor {
     pub autocomplete: Autocomplete,
 }
 
-impl AppBuilder for Arbor {}
-
 #[cfg(test)]
 mod tests {
     use std::ffi::OsString;

diff --git a/src/util/app_data.rs b/src/util/app_data.rs
@@ -52,15 +52,15 @@ impl AppData {
     }
 
     pub fn get_language(&self) -> &str {
-        return self.language.as_ref();
+        self.language.as_ref()
     }
 
     pub fn get_thread_count(&self) -> u8 {
-        return self.thread_count;
+        self.thread_count
     }
 
     pub fn get_max_suggestion(&self) -> u8 {
-        return self.max_suggestion;
+        self.max_suggestion
     }
 }
 

diff --git a/src/util/repl.rs b/src/util/repl.rs
@@ -11,7 +11,7 @@ use std::{
     io::{self, Write},
 };
 
-use crate::common::app_builder::{AppBuilder, Arbor};
+use crate::common::app_builder::Arbor;
 
 pub struct Repl {
     arbor: Arbor,
@@ -41,7 +41,7 @@ impl Repl {
                 if let Event::Key(event) = event::read()? {
                     match event.code {
                         KeyCode::Char(' ') => {
-                            if self.input.len() == 0 {
+                            if self.input.is_empty() {
                                 continue;
                             }
 
@@ -67,7 +67,7 @@ impl Repl {
                             self.selected_suggestion = 0;
                         }
                         KeyCode::Backspace => {
-                            if self.input.len() == 0 {
+                            if self.input.is_empty() {
                                 continue;
                             }
 
@@ -112,7 +112,7 @@ impl Repl {
                             self.selected_suggestion += 1;
                         }
                         KeyCode::Tab => {
-                            if self.input.len() == 0 {
+                            if self.input.is_empty() {
                                 continue;
                             }