diff options
author | Neal H. Walfield <neal@pep.foundation> | 2018-06-01 10:50:57 +0200 |
---|---|---|
committer | Neal H. Walfield <neal@pep.foundation> | 2018-06-06 11:12:11 +0200 |
commit | 642f96ae9aa56a2bd497c9aa7fc6be88bbc0989d (patch) | |
tree | fd9ef8922b4d57b4cb62e73eaa72d2df8c199cf5 /tool | |
parent | 5d2c20e2b5b93f5dd74b0faf016d67afc631b903 (diff) |
openpgp: Avoid making BufferedReader part of our public API
- The `BufferedReader` trait is primarily an implementation detail.
Thus, we avoid exporting Foo::from_buffered_reader constructors,
and making public structures generic over `BufferedReader`.
Diffstat (limited to 'tool')
-rw-r--r-- | tool/src/sqv.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tool/src/sqv.rs b/tool/src/sqv.rs index 0236f95e..159ca319 100644 --- a/tool/src/sqv.rs +++ b/tool/src/sqv.rs @@ -15,7 +15,6 @@ use clap::{App, Arg, AppSettings}; use openpgp::{HashAlgorithm, TPK, Packet, Signature, KeyID, Message}; use openpgp::parse::PacketParser; -use openpgp::parse::HashedReader; // The argument parser. fn cli_build() -> App<'static, 'static> { @@ -169,7 +168,7 @@ fn real_main() -> Result<(), failure::Error> { let file = matches.value_of_os("file").unwrap(); let hash_algos : Vec<HashAlgorithm> = sigs.iter().map(|&(ref sig, _, _)| sig.hash_algo).collect(); - let hashes = HashedReader::file(file, &hash_algos[..])?; + let hashes = openpgp::hash_file(file, &hash_algos[..])?; // Find the keys. for filename in matches.values_of_os("keyring") |