From 8bc173039650ee2f8f20de1e75e68a541b9c6b75 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Wed, 13 May 2020 16:54:38 +0200
Subject: openpgp: Allow conversion from all keys to Recipient.

---
 openpgp/src/serialize/stream.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'openpgp/src/serialize')

diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index 4b315648..b7b9f608 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -136,10 +136,7 @@ use crate::{
     crypto::SessionKey,
     packet::prelude::*,
     packet::signature,
-    packet::key::{
-        PublicParts,
-        UnspecifiedRole,
-    },
+    packet::key,
     cert::prelude::*,
 };
 use crate::packet::header::CTB;
@@ -1791,12 +1788,15 @@ impl<'a> writer::Stackable<'a, Cookie> for Compressor<'a> {
 #[derive(Debug)]
 pub struct Recipient<'a> {
     keyid: KeyID,
-    key: &'a Key<PublicParts, UnspecifiedRole>,
+    key: &'a Key<key::PublicParts, key::UnspecifiedRole>,
 }
 
-impl<'a> From<&'a Key<PublicParts, UnspecifiedRole>> for Recipient<'a> {
-    fn from(key: &'a Key<PublicParts, UnspecifiedRole>) -> Self {
-        Self::new(key.keyid(), key)
+impl<'a, P, R> From<&'a Key<P, R>> for Recipient<'a>
+    where P: key::KeyParts,
+          R: key::KeyRole,
+{
+    fn from(key: &'a Key<P, R>) -> Self {
+        Self::new(key.keyid(), key.parts_as_public().role_as_unspecified())
     }
 }
 
-- 
cgit v1.2.3