summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-06-08 12:27:45 +0200
committerJustus Winter <justus@sequoia-pgp.org>2020-06-08 12:27:45 +0200
commita2cb2c31b1d63a71fdcdd19c4eafd14882c96bcc (patch)
tree2ebb10425e43914120f961aec3d00ae08d7d1ec6
parent0bc0a2f06b55d013957940cc4005471d5f4e61ed (diff)
openpgp: Make the default for Dearmor explicit.
-rw-r--r--openpgp/src/parse/packet_parser_builder.rs10
1 files changed, 9 insertions, 1 deletions
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(),
})
}