Fix clippy warnings

wilszdev · Sep 1, 2023 · 877917d · 877917d
1 parent 4684733
commit 877917d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/bbfs-cli/src/main.rs b/bbfs-cli/src/main.rs
@@ -1,6 +1,6 @@
-use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
+use std::{fs::File, path::Path};
 
 use anyhow::anyhow;
 use argh::FromArgs;
@@ -65,7 +65,7 @@ fn get_data_dir() -> PathBuf {
     data_dir
 }
 
-fn daemonize(data_dir: &PathBuf) {
+fn daemonize(data_dir: &Path) {
     let stdout =
         File::create(data_dir.join("stdout.log")).expect("failed to create stdout log file");
     let stderr =
@@ -75,7 +75,7 @@ fn daemonize(data_dir: &PathBuf) {
 
 fn authenticate<Monster: CookieMonster>(
     cookie_monster: Monster,
-    data_dir: &PathBuf,
+    data_dir: &Path,
 ) -> anyhow::Result<String> {
     // Check for cached cookie
     let cookie_cache_file = data_dir.join("cookie");

diff --git a/bbfs-scrape/src/client.rs b/bbfs-scrape/src/client.rs
@@ -1,6 +1,6 @@
 use crate::{
     create_link_file, memberships_data::CourseMemberships, Course, CourseItem, CourseItemContent,
-    Item, SynthesizedDirectory, SynthesizedFile, User, LINK_FILE_EXT,
+    Item, SynthesizedDirectory, User, LINK_FILE_EXT,
 };
 use nix::errno::Errno;
 use pct_str::PctStr;

diff --git a/bbfs-scrape/src/lib.rs b/bbfs-scrape/src/lib.rs
@@ -127,7 +127,7 @@ impl Item {
     fn make_link_file(name: &str, link: &str) -> Item {
         Item::SynthesizedFile(SynthesizedFile {
             name: format!("{name}.{LINK_FILE_EXT}"),
-            contents: create_link_file(&link),
+            contents: create_link_file(link),
         })
     }
 }

diff --git a/cookie-monster/src/headless.rs b/cookie-monster/src/headless.rs
@@ -5,7 +5,7 @@ use fantoccini::{elements::Element, Client, ClientBuilder, Locator};
 use futures::{future::FutureExt, pin_mut, select};
 use rpassword::read_password;
 use std::io::{prelude::*, stdin, stdout};
-use std::path::PathBuf;
+use std::path::Path;
 use std::process::Command;
 use url::Url;
 
@@ -36,7 +36,7 @@ impl HeadlessCookieMonster {
             .await?)
     }
 
-    async fn complete_auth<DuoF: Fn(&str) -> ()>(
+    async fn complete_auth<DuoF: Fn(&str)>(
         client: &Client,
         handle_duo_code: DuoF,
     ) -> anyhow::Result<()> {
@@ -57,12 +57,12 @@ impl HeadlessCookieMonster {
             }
             _ = completion_task => Ok(()),
             _ = failure_task => {
-                return Err(anyhow!("Incorrect username or password"));
+                Err(anyhow!("Incorrect username or password"))
             }
         }
     }
 
-    fn eat_user_cookies<DuoF: Fn(&str) -> ()>(
+    fn eat_user_cookies<DuoF: Fn(&str)>(
         username: &str,
         password: &str,
         handle_duo_code: DuoF,
@@ -172,7 +172,7 @@ impl HeadlessCookieMonster {
 }
 
 impl CookieMonster for HeadlessCookieMonster {
-    fn authenticate(&self, _data_dir: &PathBuf) -> anyhow::Result<String> {
+    fn authenticate(&self, _data_dir: &Path) -> anyhow::Result<String> {
         print!("Username: ");
         let _ = stdout().flush();
         let mut username = "".into();

diff --git a/cookie-monster/src/lib.rs b/cookie-monster/src/lib.rs
@@ -2,8 +2,7 @@
 #[macro_use]
 extern crate objc;
 
-use std::path::PathBuf;
-use ureq;
+use std::path::Path;
 
 use anyhow::anyhow;
 use wry::webview::Url;
@@ -30,5 +29,5 @@ pub fn is_cookie_valid(cookie: &str) -> anyhow::Result<bool> {
 }
 
 pub trait CookieMonster {
-    fn authenticate(&self, data_dir: &PathBuf) -> anyhow::Result<String>;
+    fn authenticate(&self, data_dir: &Path) -> anyhow::Result<String>;
 }
diff --git a/cookie-monster/src/webview.rs b/cookie-monster/src/webview.rs
@@ -1,7 +1,7 @@
 use std::{
     fs::File,
     io::Write,
-    path::{Path, PathBuf},
+    path::Path,
     time::{Duration, Instant},
 };
 
@@ -10,7 +10,7 @@ use anyhow::anyhow;
 use wry::{
     application::{
         dpi::LogicalSize,
-        event::{Event, StartCause, WindowEvent},
+        event::{Event, WindowEvent},
         event_loop::{ControlFlow, EventLoopBuilder, EventLoopProxy},
         platform::run_return::EventLoopExtRunReturn,
         window::WindowBuilder,
@@ -24,6 +24,7 @@ use crate::CookieMonster;
 enum UserEvent {
     PageLoad(String),
     Navigation(String),
+    #[allow(dead_code)]
     GotCookie(String),
 }
 
@@ -137,7 +138,7 @@ impl WebViewCookieMonster {
 }
 
 impl CookieMonster for WebViewCookieMonster {
-    fn authenticate(&self, data_dir: &PathBuf) -> anyhow::Result<String> {
+    fn authenticate(&self, data_dir: &Path) -> anyhow::Result<String> {
         let cookie_file_buf = data_dir.join("tmp_cookie");
         let cookie_file = cookie_file_buf.as_path();