From a2cb2c31b1d63a71fdcdd19c4eafd14882c96bcc Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Mon, 8 Jun 2020 12:27:45 +0200
Subject: openpgp: Make the default for Dearmor explicit.

---
 openpgp/src/parse/packet_parser_builder.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/openpgp/src/parse/packet_parser_builder.rs b/openpgp/src/parse/packet_parser_builder.rs
index c62fce6e..2d0faf9a 100644
--- a/openpgp/src/parse/packet_parser_builder.rs
+++ b/openpgp/src/parse/packet_parser_builder.rs
@@ -26,9 +26,17 @@ pub enum Dearmor {
     Disabled,
     /// If input does not appear to be a binary encoded OpenPGP
     /// message, treat it as if it were encoded using ASCII armor.
+    ///
+    /// This is the default.
     Auto(armor::ReaderMode),
 }
 
+impl Default for Dearmor {
+    fn default() -> Self {
+        Dearmor::Auto(Default::default())
+    }
+}
+
 /// A builder for configuring a `PacketParser`.
 ///
 /// Since the default settings are usually appropriate, this mechanism
@@ -99,7 +107,7 @@ impl<'a> PacketParserBuilder<'a> {
         bio.cookie_mut().level = None;
         Ok(PacketParserBuilder {
             bio: bio,
-            dearmor: Dearmor::Auto(Default::default()),
+            dearmor: Default::default(),
             settings: PacketParserSettings::default(),
         })
     }
-- 
cgit v1.2.3