openpgp: Make conversions into Key<SecretParts, _> fallible.

  - Fixes #380.

6 files changed, 7 insertions, 7 deletions

diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs
index 4b5d231a..99ec1fd7 100644
--- a/openpgp/examples/decrypt-with.rs
+++ b/openpgp/examples/decrypt-with.rs
@@ -65,8 +65,8 @@ impl Helper {
                     .unwrap_or(false)
                 {
                     // This only works for unencrypted secret keys.
-                    if let Ok(keypair)
-                        = key.clone().mark_parts_secret().into_keypair()
+                    if let Ok(keypair) =
+                        key.clone().mark_parts_secret().unwrap().into_keypair()
                     {
                         keys.insert(key.keyid(), keypair);
                     }
diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs
index d20219ab..a2577906 100644
--- a/openpgp/examples/generate-encrypt-decrypt.rs
+++ b/openpgp/examples/generate-encrypt-decrypt.rs
@@ -123,7 +123,7 @@ impl<'a> DecryptionHelper for Helper<'a> {
             .unwrap();
 
         // The secret key is not encrypted.
-        let mut pair = key.mark_parts_secret().into_keypair().unwrap();
+        let mut pair = key.mark_parts_secret().unwrap().into_keypair().unwrap();
 
         pkesks[0].decrypt(&mut pair)
             .and_then(|(algo, session_key)| decrypt(algo, &session_key))
diff --git a/openpgp/examples/generate-sign-verify.rs b/openpgp/examples/generate-sign-verify.rs
index 98e94f21..0ab1c7a5 100644
--- a/openpgp/examples/generate-sign-verify.rs
+++ b/openpgp/examples/generate-sign-verify.rs
@@ -41,7 +41,7 @@ fn sign(sink: &mut dyn Write, plaintext: &str, tsk: &openpgp::TPK)
            -> openpgp::Result<()> {
     // Get the keypair to do the signing from the TPK.
     let keypair = tsk.keys_valid().signing_capable().nth(0).unwrap().2
-        .clone().mark_parts_secret().into_keypair()?;
+        .clone().mark_parts_secret().unwrap().into_keypair()?;
 
     // Start streaming an OpenPGP message.
     let message = Message::new(sink);
diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index d17aec44..fc161373 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -41,7 +41,7 @@ fn main() {
                         .expect("decryption failed");
                 }
                 n += 1;
-                key.mark_parts_secret().into_keypair().unwrap()
+                key.mark_parts_secret().unwrap().into_keypair().unwrap()
             });
         }
 
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index 98202bd2..54c9ceef 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -37,7 +37,7 @@ fn main() {
                         .expect("decryption failed");
                 }
                 n += 1;
-                key.mark_parts_secret().into_keypair().unwrap()
+                key.mark_parts_secret().unwrap().into_keypair().unwrap()
             });
         }
 
diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs
index 523c9e26..ec80e87f 100644
--- a/openpgp/examples/sign.rs
+++ b/openpgp/examples/sign.rs
@@ -36,7 +36,7 @@ fn main() {
                         .expect("decryption failed");
                 }
                 n += 1;
-                key.mark_parts_secret().into_keypair().unwrap()
+                key.mark_parts_secret().unwrap().into_keypair().unwrap()
             });
         }