X-Git-Url: https://code.octet-stream.net/hashgood/blobdiff_plain/93ceef0a11e57980c967222a6504da7005895a5b..e6ad985239dcce1d556c0606ae1628ac14504382:/src/main.rs diff --git a/src/main.rs b/src/main.rs index b611b14..ff5a00c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -20,11 +20,6 @@ const EXIT_MISMATCH: i32 = 2; #[derive(StructOpt)] #[structopt(name = "hashgood")] pub struct Opt { - /// Read the hash from the clipboard - #[cfg(feature = "paste")] - #[structopt(short = "p", long = "paste")] - paste: bool, - /// Disable ANSI colours in output #[structopt(short = "C", long = "no-colour")] no_colour: bool, @@ -42,19 +37,6 @@ pub struct Opt { hash: Option, } -impl Opt { - fn get_paste(&self) -> bool { - #[cfg(feature = "paste")] - { - self.paste - } - #[cfg(not(feature = "paste"))] - { - false - } - } -} - /// Types of supported digest algorithm #[derive(Debug, PartialEq, Copy, Clone)] pub enum Algorithm { @@ -79,7 +61,6 @@ impl Algorithm { #[derive(Debug, PartialEq)] pub enum VerificationSource { CommandArgument, - Clipboard, RawFile(String), DigestsFile(String), } @@ -205,15 +186,11 @@ fn hashgood() -> Result<(), Box> { /// Parse the command line options and check for ambiguous or inconsistent settings fn get_verified_options() -> Result { let opt = Opt::from_args(); - let hash_methods = - opt.hash.is_some() as i32 + opt.get_paste() as i32 + opt.hash_file.is_some() as i32; + let hash_methods = opt.hash.is_some() as i32 + opt.hash_file.is_some() as i32; if hash_methods > 1 { if opt.hash.is_some() { eprintln!("* specified as command line argument"); } - if opt.get_paste() { - eprintln!("* paste from clipboard (-p)") - } if opt.hash_file.is_some() { eprintln!("* check hash from file (-c)") }