From 2d6a1ab728afe1b5917d6aa7a79ad21f1b0ac040 Mon Sep 17 00:00:00 2001
From: Wiktor Kwapisiewicz <wiktor@metacode.biz>
Date: Mon, 21 Sep 2020 09:44:33 +0200
Subject: openpgp: Fix examples to use stream::Armorer.

---
 openpgp/examples/sign-detached.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'openpgp/examples/sign-detached.rs')

diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index f16b1e93..944abf76 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -8,9 +8,9 @@ use anyhow::Context;
 extern crate rpassword;
 
 extern crate sequoia_openpgp as openpgp;
-use crate::openpgp::armor;
+
 use crate::openpgp::parse::Parse;
-use crate::openpgp::serialize::stream::{Message, Signer};
+use crate::openpgp::serialize::stream::{Armorer, Message, Signer};
 use crate::openpgp::policy::StandardPolicy as P;
 
 fn main() -> openpgp::Result<()> {
@@ -55,14 +55,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::Signature)
-        .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()?;
+
     // Now, create a signer that emits the detached signature(s).
     let mut signer =
         Signer::new(message, keys.pop().context("No key for signing")?);
@@ -80,9 +80,5 @@ fn main() -> openpgp::Result<()> {
     signer.finalize()
         .context("Failed to write data")?;
 
-    // Finalize the armor writer.
-    sink.finalize()
-        .context("Failed to write data")?;
-
     Ok(())
 }
-- 
cgit v1.2.3