summaryrefslogtreecommitdiffstats
path: root/openpgp/examples/wrap-literal.rs
diff options
context:
space:
mode:
Diffstat (limited to 'openpgp/examples/wrap-literal.rs')
-rw-r--r--openpgp/examples/wrap-literal.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/openpgp/examples/wrap-literal.rs b/openpgp/examples/wrap-literal.rs
index 7f2b6023..155638a8 100644
--- a/openpgp/examples/wrap-literal.rs
+++ b/openpgp/examples/wrap-literal.rs
@@ -9,8 +9,8 @@ use std::io;
use anyhow::Context;
extern crate sequoia_openpgp as openpgp;
-use crate::openpgp::armor;
-use crate::openpgp::serialize::stream::{Message, LiteralWriter};
+
+use crate::openpgp::serialize::stream::{Armorer, Message, LiteralWriter};
fn main() -> openpgp::Result<()> {
let args: Vec<String> = env::args().collect();
@@ -20,14 +20,14 @@ fn main() -> openpgp::Result<()> {
}
// Compose a writer stack corresponding to the output format and
- // packet structure we want. First, we want the output to be
- // ASCII armored.
- let mut sink = armor::Writer::new(io::stdout(), armor::Kind::Message)
- .context("Failed to create armored writer.")?;
+ // packet structure we want.
+ let mut sink = io::stdout();
// Stream an OpenPGP message.
let message = Message::new(&mut sink);
+ let message = Armorer::new(message).build()?;
+
// Then, create a literal writer to wrap the data in a literal
// message packet.
let mut literal = LiteralWriter::new(message).build()
@@ -41,9 +41,5 @@ fn main() -> openpgp::Result<()> {
literal.finalize()
.context("Failed to write data")?;
- // Finalize the armor writer.
- sink.finalize()
- .context("Failed to write data")?;
-
Ok(())
}