1 files changed, 6 insertions, 10 deletions
diff --git a/openpgp/examples/pad.rs b/openpgp/examples/pad.rs
index 825d7758..10ee1804 100644
--- a/openpgp/examples/pad.rs
+++ b/openpgp/examples/pad.rs
@@ -7,12 +7,12 @@ use std::io;
 use anyhow::Context;
 
 extern crate sequoia_openpgp as openpgp;
-use crate::openpgp::armor;
+
 use crate::openpgp::KeyID;
 use crate::openpgp::types::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::stream::{
-    Message, LiteralWriter, Encryptor, Recipient, padding::*,
+    Armorer, Message, LiteralWriter, Encryptor, Recipient, padding::*,
 };
 use crate::openpgp::policy::StandardPolicy as P;
 
@@ -49,14 +49,14 @@ fn main() -> openpgp::Result<()> {
         .collect::<Vec<_>>();
 
     // 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 an 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()?;
+
     // We want to encrypt a literal data packet.
     let encryptor = Encryptor::for_recipients(message, recipients)
         .build().context("Failed to create encryptor")?;
@@ -75,9 +75,5 @@ fn main() -> openpgp::Result<()> {
     // writer stack.
     literal_writer.finalize()?;
 
-    // Finalize the armor writer.
-    sink.finalize()
-        .context("Failed to write data")?;
-
     Ok(())
 }