1 files changed, 6 insertions, 10 deletions
diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index 1e4939c6..c93ca744 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -7,11 +7,11 @@ use std::io;
 use anyhow::Context;
 
 extern crate sequoia_openpgp as openpgp;
+
 use crate::openpgp::{
-    armor,
     Packet,
     parse::{Parse, PacketParserResult},
-    serialize::Marshal,
+    serialize::{Marshal, stream::Armorer},
 };
 use crate::openpgp::serialize::stream::{Message, LiteralWriter, Signer};
 use crate::openpgp::policy::StandardPolicy as P;
@@ -58,14 +58,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 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()?;
+
     // Now, create a signer that emits the signature(s).
     let mut signer =
         Signer::new(message, keys.pop().context("No key for signing")?);
@@ -124,9 +124,5 @@ fn main() -> openpgp::Result<()> {
     signer.finalize()
         .context("Failed to write data")?;
 
-    // Finalize the armor writer.
-    sink.finalize()
-        .context("Failed to write data")?;
-
     Ok(())
 }