Remove oddball paste feature

[hashgood] / src / verify.rs

diff --git a/src/verify.rs b/src/verify.rs
index c9ded29f9a083685d7ed5dd55fbf9eafa8f1ccff..e655d1a5052024a33d82079098f3edc82614be9c 100644 (file)
--- a/src/verify.rs
+++ b/src/verify.rs
@@ -2,8 +2,6 @@ use super::{
     Algorithm, CandidateHash, CandidateHashes, Hash, MatchLevel, MessageLevel, Opt, Verification,
     VerificationSource,
 };
-#[cfg(feature = "paste")]
-use copypasta::{ClipboardContext, ClipboardProvider};
 use std::fs::File;
 use std::io;
 use std::io::prelude::*;
@@ -16,8 +14,6 @@ use std::path::Path;
 pub fn get_candidate_hashes(opt: &Opt) -> Result<Option<CandidateHashes>, String> {
     if let Some(hash_string) = &opt.hash {
         return Ok(Some(get_by_parameter(hash_string)?));
-    } else if opt.get_paste() {
-        return Ok(Some(get_from_clipboard()?));
     } else if let Some(hash_file) = &opt.hash_file {
         return Ok(Some(get_from_file(hash_file)?));
     }
@@ -40,39 +36,6 @@ fn get_by_parameter(param: &str) -> Result<CandidateHashes, String> {
     })
 }
 
-/// Generate a candidate hash from the system clipboard, or throw an error.
-fn get_from_clipboard() -> Result<CandidateHashes, String> {
-    #[cfg(feature = "paste")]
-    {
-        let mut ctx: ClipboardContext = match ClipboardContext::new() {
-            Ok(ctx) => ctx,
-            Err(e) => return Err(format!("Error getting system clipboard: {}", e)),
-        };
-
-        let possible_hash = match ctx.get_contents() {
-            Ok(value) => value,
-            Err(e) => format!("Error reading from clipboard: {}", e),
-        };
-
-        let bytes = hex::decode(&possible_hash)
-            .map_err(|_| "Clipboard contains invalid or truncated hex".to_owned())?;
-        let alg = Algorithm::from_len(bytes.len())?;
-        let candidate = CandidateHash {
-            filename: None,
-            bytes,
-        };
-        Ok(CandidateHashes {
-            alg,
-            hashes: vec![candidate],
-            source: VerificationSource::Clipboard,
-        })
-    }
-    #[cfg(not(feature = "paste"))]
-    {
-        Err("Paste not implemented".to_owned())
-    }
-}
-
 /// Generate a candidate hash from the digests file specified (could be "-" for STDIN), or throw an error.
 fn get_from_file(path: &Path) -> Result<CandidateHashes, String> {
     // Get a reader for either standard input or the chosen path
@@ -299,28 +262,28 @@ mod tests {
         let invalid5 = "1eb85fc97224598dad1852b5d 483bbcf0aa8608790dcc657a5a2a761ae9c8c6";
 
         assert!(matches!(
-            read_raw_candidate_from_file(valid_md5, &example_path),
+            read_raw_candidate_from_file(valid_md5, example_path),
             Some(CandidateHashes {
                 alg: Algorithm::Md5,
                 ..
             })
         ));
         assert!(matches!(
-            read_raw_candidate_from_file(valid_sha1, &example_path),
+            read_raw_candidate_from_file(valid_sha1, example_path),
             Some(CandidateHashes {
                 alg: Algorithm::Sha1,
                 ..
             })
         ));
         assert!(matches!(
-            read_raw_candidate_from_file(&valid_sha1_2, &example_path),
+            read_raw_candidate_from_file(&valid_sha1_2, example_path),
             Some(CandidateHashes {
                 alg: Algorithm::Sha1,
                 ..
             })
         ));
         assert!(matches!(
-            read_raw_candidate_from_file(valid_sha256, &example_path),
+            read_raw_candidate_from_file(valid_sha256, example_path),
             Some(CandidateHashes {
                 alg: Algorithm::Sha256,
                 ..
@@ -328,7 +291,7 @@ mod tests {
         ));
 
         for i in &[invalid1, invalid2, invalid3, invalid4, invalid5] {
-            assert!(read_raw_candidate_from_file(*i, &example_path).is_none());
+            assert!(read_raw_candidate_from_file(*i, example_path).is_none());
         }
     }
 
@@ -338,9 +301,9 @@ mod tests {
         75eb7420a9f5a260b04a3e8ad51e50f2838a17fc  lel.txt
 
         fe6c26d485a3573a1cb0ad0682f5105325a1905f  shasums";
-        let lines = shasums.lines().map(|l| std::io::Result::Ok(l));
+        let lines = shasums.lines().map(std::io::Result::Ok);
         let path = Path::new("SHASUMS");
-        let candidates = read_coreutils_digests_from_file(lines, &path);
+        let candidates = read_coreutils_digests_from_file(lines, path);
 
         assert_eq!(
             candidates,
@@ -372,7 +335,7 @@ mod tests {
         let extra_space = "4b91f7a387a6edd4a7c0afb2897f1ca968c9695b   cp";
 
         for digest in [no_format, invalid_format, extra_space] {
-            let lines = digest.lines().map(|l| std::io::Result::Ok(l));
+            let lines = digest.lines().map(std::io::Result::Ok);
             assert!(
                 read_coreutils_digests_from_file(lines, Path::new("SHASUMS")).is_none(),
                 "Should be invalid digest: {:?}",