From 01a1e5e4f45dc80cd430d18492817b733fab5603 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 26 Feb 2022 22:23:34 +0100
Subject: Fix linter warnings

---
 src/main.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index 3e3e741..bed2ce1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,15 +19,15 @@ struct Opt {
 
 fn main() -> Result<()> {
     let deck_path = Opt::from_args().deck;
-    let conn = db::db::init(db_path(&deck_path))?;
-    let deck_name = deck::pp_from_path(&deck_path).unwrap_or("Deck".to_string());
-    let mut term = gui::gui::terminal()?;
+    let conn = db::init(db_path(&deck_path))?;
+    let deck_name = deck::pp_from_path(&deck_path).unwrap_or_else(|| "Deck".to_string());
+    let mut term = gui::terminal()?;
     let events = Events::new();
-    gui::gui::synchronize(&conn, &mut term, &events, &deck_path, &deck_name)?;
-    gui::gui::start(&conn, &mut term, &events, &deck_name)
+    gui::synchronize(&conn, &mut term, &events, &deck_path, &deck_name)?;
+    gui::start(&conn, &mut term, &events, &deck_name)
 }
 
-fn db_path(deck_path: &String) -> String {
+fn db_path(deck_path: &str) -> String {
     let mut path = PathBuf::from(deck_path);
     path.set_extension("db");
     path.to_string_lossy().to_string()
-- 
cgit v1.2.3