From 46f1f772f437e6d88dad2f421274a83fc6ddfeb9 Mon Sep 17 00:00:00 2001
From: jake <jake@sharnoth.com>
Date: Fri, 18 Jun 2021 17:51:30 -0600
Subject: [PATCH] lint src/patch/*

---
 src/patch/mod.rs   |  3 ++-
 src/patch/patch.rs | 13 ++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/patch/mod.rs b/src/patch/mod.rs
index ca4c5d6..323a777 100644
--- a/src/patch/mod.rs
+++ b/src/patch/mod.rs
@@ -1 +1,2 @@
-pub mod patch;
\ No newline at end of file
+#[allow(clippy::module_inception)]
+pub mod patch;
diff --git a/src/patch/patch.rs b/src/patch/patch.rs
index 9d71f10..13a9928 100644
--- a/src/patch/patch.rs
+++ b/src/patch/patch.rs
@@ -2,7 +2,7 @@ use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::io;
 use std::io::{Read};
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use rand::Rng;
 use crc::{crc32, Hasher32};
 use libpso::{PacketParseError, PSOPacket};
@@ -60,7 +60,7 @@ impl PatchFileTree {
             PatchFileTree::Directory(dir, files) => {
                 v.push(PatchTreeIterItem::Directory(dir.clone()));
                 for file in files {
-                    v.append(&mut PatchFileTree::iter_dir(&file));
+                    v.append(&mut PatchFileTree::iter_dir(file));
                 }
                 v.push(PatchTreeIterItem::UpDirectory);
             },
@@ -197,7 +197,7 @@ impl ServerState for PatchServerState {
                 let p = vec![SendPatchPacket::FilesToPatchMetadata(FilesToPatchMetadata::new(total_size, total_files)),
                              SendPatchPacket::PatchStartList(PatchStartList {})
                 ];
-                Box::new(p.into_iter().chain(SendFileIterator::new(&self)).map(move |pkt| (id, pkt)))
+                Box::new(p.into_iter().chain(SendFileIterator::new(self)).map(move |pkt| (id, pkt)))
             }
         })
     }
@@ -214,12 +214,11 @@ fn load_patch_dir(basedir: &str, patchbase: &str, file_ids: &mut HashMap<u32, Pa
     let mut dirs = Vec::new();
     for p in paths {
         let path = p.expect("not a real path").path();
+        let patch_path = path.strip_prefix(basedir).unwrap();
         if path.is_dir() {
-            let patch_path = path.strip_prefix(basedir).unwrap();
             dirs.push(load_patch_dir(path.to_str().unwrap(), patch_path.to_str().unwrap(), file_ids));
         }
         else {
-            let patch_path = path.strip_prefix(basedir).unwrap();
             files.push(PatchFileTree::File(patch_path.to_path_buf(), file_ids.len() as u32));
             let (checksum, size) = get_checksum_and_size(&path).unwrap();
             file_ids.insert(file_ids.len() as u32, PatchFile {
@@ -264,7 +263,7 @@ fn get_file_list_packets(patch_file_tree: &PatchFileTree) -> Vec<SendPatchPacket
     pkts
 }
 
-fn get_checksum_and_size(path: &PathBuf) -> Result<(u32, u32), PatchError> {
+fn get_checksum_and_size(path: &Path) -> Result<(u32, u32), PatchError> {
     let file = fs::File::open(path)?;
     let size = file.metadata().unwrap().len();
     let mut crc = crc32::Digest::new(crc32::IEEE);
@@ -307,7 +306,7 @@ impl SendFileIterator {
             file_iter: Box::new(state.patch_file_tree.flatten().into_iter().filter(move |file| {
                 match file {
                     PatchTreeIterItem::File(_path, id) => {
-                        file_ids_to_update.contains(&id)
+                        file_ids_to_update.contains(id)
                     },
                     _ => true,
                 }