From efc45302fb53b65ab8839a8d8aa982d857547352 Mon Sep 17 00:00:00 2001
From: Nora Widdecke <nora@sequoia-pgp.org>
Date: Thu, 24 Sep 2020 10:24:20 +0200
Subject: openpgp: Fix deprecation notices.

---
 openpgp/src/types/mod.rs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'openpgp/src/types/mod.rs')

diff --git a/openpgp/src/types/mod.rs b/openpgp/src/types/mod.rs
index dc98dfe4..cf3b4568 100644
--- a/openpgp/src/types/mod.rs
+++ b/openpgp/src/types/mod.rs
@@ -97,13 +97,11 @@ pub(crate) use timestamp::normalize_systemtime;
 pub enum PublicKeyAlgorithm {
     /// RSA (Encrypt or Sign)
     RSAEncryptSign,
-    /// RSA Encrypt-Only
-    #[deprecated(since = "rfc4880",
-                 note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")]
+    /// RSA Encrypt-Only, deprecated in RFC 4880.
+    #[deprecated(note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")]
     RSAEncrypt,
-    /// RSA Sign-Only
-    #[deprecated(since = "rfc4880",
-                 note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")]
+    /// RSA Sign-Only, deprecated in RFC 4880.
+    #[deprecated(note = "Use `PublicKeyAlgorithm::RSAEncryptSign`.")]
     RSASign,
     /// ElGamal (Encrypt-Only)
     ElGamalEncrypt,
@@ -113,9 +111,8 @@ pub enum PublicKeyAlgorithm {
     ECDH,
     /// Elliptic curve DSA
     ECDSA,
-    /// ElGamal (Encrypt or Sign)
-    #[deprecated(since = "rfc4880",
-                 note = "If you really must, use \
+    /// ElGamal (Encrypt or Sign), deprecated in RFC 4880.
+    #[deprecated(note = "If you really must, use \
                          `PublicKeyAlgorithm::ElGamalEncrypt`.")]
     ElGamalEncryptSign,
     /// "Twisted" Edwards curve DSA
-- 
cgit v1.2.3