Fix warnings (#537)

Author: casey

.github/workflows/build.yaml

@@ -14,10 +14,6 @@ defaults:
   run:
     shell: bash
 
-env:
-  # Cache issues can sometimes be fixed by incrementing this value.
-  CACHE_KEY: 6
-
 jobs:
   all:
     name: All
@@ -54,15 +50,6 @@ jobs:
         brew install gnu-tar
         echo /usr/local/opt/gnu-tar/libexec/gnubin > $GITHUB_PATH
 
-    - name: Cache
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          target
-        key: cargo-${{ env.CACHE_KEY }}-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
-
     - name: Install Rust Toolchain Components
       uses: actions-rs/toolchain@v1
       with:
@@ -71,6 +58,8 @@ jobs:
         target: ${{ matrix.target }}
         toolchain: stable
 
+    - uses: Swatinem/rust-cache@v2
+
     - name: Info
       run: |
         rustup --version
@@ -104,9 +93,9 @@ jobs:
 
     - name: Install `mdbook`
       if: matrix.os != 'windows-latest'
-      uses: peaceiris/actions-mdbook@v1
+      uses: peaceiris/actions-mdbook@v2
       with:
-        mdbook-version: latest
+        mdbook-version: 0.4.40
 
     - name: Build Book
       if: matrix.os != 'windows-latest'

bin/gen/src/common.rs

@@ -6,15 +6,15 @@ pub(crate) use std::{
   fs::{self, File},
   io,
   ops::Deref,
-  path::{Path, PathBuf, StripPrefixError},
+  path::{Path, PathBuf},
   process::{self, Command, ExitStatus, Stdio},
   str,
 };
 
 pub(crate) use ansi_term::Style;
 pub(crate) use askama::Template;
 pub(crate) use fehler::{throw, throws};
-pub(crate) use git2::{Oid, Repository};
+pub(crate) use git2::Repository;
 pub(crate) use libc::EXIT_FAILURE;
 pub(crate) use log::info;
 pub(crate) use regex::Regex;

bin/gen/src/error.rs

@@ -17,23 +17,6 @@ pub(crate) enum Error {
     command: String,
     exit_status: ExitStatus,
   },
-  #[snafu(display(
-    "Failed to deserialize commit metadata: {}\n{}\n{}",
-    source,
-    hash,
-    message
-  ))]
-  CommitMetadataDeserialize {
-    hash: Oid,
-    message: String,
-    source: serde_yaml::Error,
-  },
-  #[snafu(display("Commit missing metadata:\n{}\n{}", hash, message))]
-  CommitMetadataMissing { hash: Oid, message: String },
-  #[snafu(display("Commit has `{}` parents: {}", hash, parents))]
-  CommitParents { hash: Oid, parents: usize },
-  #[snafu(display("Commit has no summery: {}", hash))]
-  CommitSummery { hash: Oid },
   #[snafu(display("Failed to deserialize config from `{}`: {}", path.display(), source))]
   ConfigDeserialize {
     path: PathBuf,
@@ -53,12 +36,6 @@ pub(crate) enum Error {
   #[snafu(display("I/O error at `{}`: {}", path.display(), source))]
   Filesystem { path: PathBuf, source: io::Error },
   #[snafu(display("I/O error copying `{}` to `{}`: {}", src.display(), dst.display(), source))]
-  FilesystemCopy {
-    src: PathBuf,
-    dst: PathBuf,
-    source: io::Error,
-  },
-  #[snafu(display("I/O error copying `{}` to `{}`: {}", src.display(), dst.display(), source))]
   FilesystemRecursiveCopy {
     src: PathBuf,
     dst: PathBuf,
@@ -77,10 +54,6 @@ pub(crate) enum Error {
   Tempdir { source: io::Error },
   #[snafu(display("Failed to render template: {}", source))]
   TemplateRender { source: askama::Error },
-  #[snafu(display("Failed to get workdir for repo at `{}`", repo.display()))]
-  Workdir { repo: PathBuf },
-  #[snafu(display("Failed to strip path prefix: {}", source))]
-  StripPrefix { source: StripPrefixError },
 }
 
 impl From<regex::Error> for Error {

src/common.rs

@@ -16,7 +16,6 @@ pub(crate) use std::{
   num::{ParseFloatError, ParseIntError, TryFromIntError},
   ops::{AddAssign, Div, DivAssign, Mul, MulAssign, Sub, SubAssign},
   path::{self, Path, PathBuf},
-  process::ExitStatus,
   str::{self, FromStr},
   string::FromUtf8Error,
   sync::{mpsc::channel, Once},

src/error.rs

@@ -14,18 +14,12 @@ pub(crate) enum Error {
   ByteSuffix { text: String, suffix: String },
   #[snafu(display("{}", source))]
   Clap { source: clap::Error },
-  #[snafu(display("Failed to invoke command `{}`: {}", command, source))]
-  CommandInvoke { command: String, source: io::Error },
-  #[snafu(display("Command `{}` returned bad exit status: {}", command, status))]
-  CommandStatus { command: String, status: ExitStatus },
   #[snafu(display("Failed to get current directory: {}", source))]
   CurrentDirectoryGet { source: io::Error },
   #[snafu(display("Filename was not valid unicode: `{}`", filename.display()))]
   FilenameDecode { filename: PathBuf },
   #[snafu(display("Path had no file name: `{}`", path.display()))]
   FilenameExtract { path: PathBuf },
-  #[snafu(display("Unknown file ordering: `{}`", text))]
-  FileOrderUnknown { text: String },
   #[snafu(display("I/O error at `{}`: {}", path.display(), source))]
   Filesystem { source: io::Error, path: PathBuf },
   #[snafu(display("Error searching for files: {}", source))]
@@ -44,8 +38,6 @@ pub(crate) enum Error {
     message,
   ))]
   Internal { message: String },
-  #[snafu(display("Unknown lint: {}", text))]
-  LintUnknown { text: String },
   #[snafu(display("Failed to parse magnet link `{}`: {}", text, source))]
   MagnetLinkParse {
     text: String,

src/peer/client.rs

@@ -91,10 +91,9 @@ impl Client {
     if let State::WantInfo(_) = self.state {
       if handshake.metadata_size.is_none() {
         return Err(Error::PeerUtMetadataMetadataSizeNotKnown);
-      } else if handshake
+      } else if !handshake
         .message_ids
-        .get(extended::UtMetadata::NAME)
-        .is_none()
+        .contains_key(extended::UtMetadata::NAME)
       {
         return Err(Error::PeerUtMetadataNotSupported);
       }

src/platform.rs

@@ -3,65 +3,10 @@ use crate::common::*;
 pub(crate) struct Platform;
 
 #[cfg(target_os = "windows")]
-impl PlatformInterface for Platform {
-  fn hidden(path: &Path) -> Result<bool, Error> {
-    use std::os::windows::fs::MetadataExt;
-
-    const HIDDEN_MASK_WIN: u32 = 0x0000_0002;
-
-    let metadata = path.metadata().context(error::Filesystem { path })?;
-    Ok((metadata.file_attributes() & HIDDEN_MASK_WIN) != 0)
-  }
-}
+impl PlatformInterface for Platform {}
 
 #[cfg(target_os = "macos")]
-impl PlatformInterface for Platform {
-  fn hidden(path: &Path) -> Result<bool, Error> {
-    use std::os::macos::fs::MetadataExt;
-
-    const HIDDEN_MASK_MAC: u32 = 0x0000_8000;
-
-    let metadata = path.metadata().context(error::Filesystem { path })?;
-
-    Ok(metadata.st_flags() & HIDDEN_MASK_MAC != 0)
-  }
-}
+impl PlatformInterface for Platform {}
 
 #[cfg(not(any(target_os = "windows", target_os = "macos")))]
-impl PlatformInterface for Platform {
-  fn hidden(_path: &Path) -> Result<bool, Error> {
-    Ok(false)
-  }
-}
-
-#[cfg(tests)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn hidden() {
-    let tmp = tempdir().unwrap();
-
-    let file = tmp.path().join("file");
-
-    assert!(!Platform::hidden(&file));
-
-    if cfg!(target_os = "windows") {
-      Command::new("attrib")
-        .arg("+h")
-        .arg(&file)
-        .status()
-        .unwrap();
-    } else if cfg!(target_os = "macos") {
-      Command::new("chflags")
-        .arg("hidden")
-        .arg(&file)
-        .status()
-        .unwrap();
-    } else {
-      return;
-    }
-
-    assert!(Platform::hidden(&file));
-  }
-}
+impl PlatformInterface for Platform {}

src/platform_interface.rs

@@ -12,6 +12,4 @@ pub(crate) trait PlatformInterface {
   fn open_target(target: &OsStr) -> Result<(), Error> {
     open::that(target).context(error::OpenerInvoke)
   }
-
-  fn hidden(path: &Path) -> Result<bool, Error>;
 }

src/reckoner.rs

@@ -4,17 +4,6 @@ pub(crate) trait Reckoner<K> {
   fn increment_ref(&mut self, k: &K)
   where
     K: Clone;
-
-  fn increment(&mut self, k: K);
-
-  fn increment_multiple<I>(&mut self, i: I)
-  where
-    I: IntoIterator<Item = K>,
-  {
-    for k in i {
-      self.increment(k);
-    }
-  }
 }
 
 impl<K: Ord> Reckoner<K> for BTreeMap<K, u64> {
@@ -28,10 +17,6 @@ impl<K: Ord> Reckoner<K> for BTreeMap<K, u64> {
       self.insert(k.clone(), 1);
     }
   }
-
-  fn increment(&mut self, k: K) {
-    *self.entry(k).or_insert(0) += 1;
-  }
 }
 
 impl<K: Hash + Eq> Reckoner<K> for HashMap<K, u64> {
@@ -45,10 +30,6 @@ impl<K: Hash + Eq> Reckoner<K> for HashMap<K, u64> {
       self.insert(k.clone(), 1);
     }
   }
-
-  fn increment(&mut self, k: K) {
-    *self.entry(k).or_insert(0) += 1;
-  }
 }
 
 impl<K: Ord> Reckoner<K> for Vec<(K, u64)> {
@@ -65,15 +46,4 @@ impl<K: Ord> Reckoner<K> for Vec<(K, u64)> {
       }
     }
   }
-
-  fn increment(&mut self, k: K) {
-    match self.binary_search_by_key(&&k, |(key, _count)| key) {
-      Ok(i) => {
-        self[i].1 *= 1;
-      }
-      Err(i) => {
-        self.insert(i, (k, 1));
-      }
-    }
-  }
 }

src/subcommand/torrent/verify.rs

@@ -78,8 +78,7 @@ impl Verify {
 
     let content = self
       .content
-      .as_ref()
-      .cloned()
+      .clone()
       .or_else(|| {
         self
           .base_directory

src/torrent_summary.rs

@@ -209,12 +209,7 @@ impl TorrentSummary {
       content_size: self.metainfo.content_size().count(),
       private: self.metainfo.info.private.unwrap_or_default(),
       tracker: self.metainfo.announce.clone(),
-      announce_list: self
-        .metainfo
-        .announce_list
-        .as_ref()
-        .map(Clone::clone)
-        .unwrap_or_default(),
+      announce_list: self.metainfo.announce_list.clone().unwrap_or_default(),
       update_url: self
         .metainfo
         .info