Tighten up digests file parsing

[hashgood] / src / main.rs

diff --git a/src/main.rs b/src/main.rs
index a82c40a69f1d12ff400bee560dd41b52ba3079c5..2c7e1899dbbf4fab3f72f60ba79570bd86fc6c6d 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -39,10 +39,12 @@ pub struct Opt {
 
 impl Opt {
     fn get_paste(&self) -> bool {
 
 impl Opt {
     fn get_paste(&self) -> bool {

-        #[cfg(feature = "paste")] {
+        #[cfg(feature = "paste")]
+        {

             return self.paste;
         }
             return self.paste;
         }

-        #[cfg(not(feature = "paste"))] {
+        #[cfg(not(feature = "paste"))]
+        {

             return false;
         }
     }
             return false;
         }
     }


@@ -69,6 +71,7 @@ impl Algorithm {
 }
 
 /// The method by which one or more hashes were supplied to verify the calculated digest
 }
 
 /// The method by which one or more hashes were supplied to verify the calculated digest

+#[derive(Debug, PartialEq)]

 pub enum VerificationSource {
     CommandArgument,
     Clipboard,
 pub enum VerificationSource {
     CommandArgument,
     Clipboard,


@@ -100,6 +103,7 @@ impl Hash {
 }
 
 /// A possible hash to match against. The algorithm is assumed.
 }
 
 /// A possible hash to match against. The algorithm is assumed.

+#[derive(Debug, PartialEq)]

 pub struct CandidateHash {
     bytes: Vec<u8>,
     filename: Option<String>,
 pub struct CandidateHash {
     bytes: Vec<u8>,
     filename: Option<String>,


@@ -107,6 +111,7 @@ pub struct CandidateHash {
 
 /// A list of candidate hashes that our input could potentially match. At this point it is
 /// assumed that we will be verifying a digest of a particular, single algorithm.
 
 /// A list of candidate hashes that our input could potentially match. At this point it is
 /// assumed that we will be verifying a digest of a particular, single algorithm.

+#[derive(Debug, PartialEq)]

 pub struct CandidateHashes {
     alg: Algorithm,
     hashes: Vec<CandidateHash>,
 pub struct CandidateHashes {
     alg: Algorithm,
     hashes: Vec<CandidateHash>,