diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-11-19 17:54:28 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-11-19 17:54:28 +0100 |
| commit | efe767fc4e48ef2a53e7f8cb7e44d46d884b9694 (patch) | |
| tree | a525d06144a064038b0d26de6169f1b9e98cb8bd /tool | |
| parent | 505f45f8077ac92b4ae5fa6cde88a10a3be15af3 (diff) | |
openpgp: Use the builder pattern for stream::Compressor.
- See #375.
Diffstat (limited to 'tool')
| -rw-r--r-- | tool/src/commands/mod.rs | 12 | ||||
| -rw-r--r-- | tool/tests/sq-sign.rs | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs index 3e41b562..f164e3a2 100644 --- a/tool/src/commands/mod.rs +++ b/tool/src/commands/mod.rs @@ -137,12 +137,12 @@ pub fn encrypt(mapping: &mut store::Mapping, match compression { "none" => (), "pad" => sink = Padder::new(sink, padme)?, - "zip" => - sink = Compressor::new(sink, CompressionAlgorithm::Zip, None)?, - "zlib" => - sink = Compressor::new(sink, CompressionAlgorithm::Zlib, None)?, - "bzip2" => - sink = Compressor::new(sink, CompressionAlgorithm::BZip2, None)?, + "zip" => sink = + Compressor::new(sink).algo(CompressionAlgorithm::Zip).build()?, + "zlib" => sink = + Compressor::new(sink).algo(CompressionAlgorithm::Zlib).build()?, + "bzip2" => sink = + Compressor::new(sink).algo(CompressionAlgorithm::BZip2).build()?, _ => unreachable!("all possible choices are handled") } diff --git a/tool/tests/sq-sign.rs b/tool/tests/sq-sign.rs index c9122b16..00868515 100644 --- a/tool/tests/sq-sign.rs +++ b/tool/tests/sq-sign.rs @@ -216,9 +216,9 @@ fn sq_sign_append_on_compress_then_sign() { let keypair = KeyPair::new(key.clone(), sec).unwrap(); let signer = Signer::new(Message::new(File::create(&sig0).unwrap()), keypair).build().unwrap(); - let compressor = Compressor::new(signer, CompressionAlgorithm::Uncompressed, - None) - .unwrap(); + let compressor = Compressor::new(signer) + .algo(CompressionAlgorithm::Uncompressed) + .build().unwrap(); let mut literal = LiteralWriter::new(compressor).build() .unwrap(); io::copy( |