diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2019-12-19 21:47:19 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2019-12-19 21:51:19 +0100 |
| commit | b3ba97146f534ac5cf67db7f72d8a633112d0a18 (patch) | |
| tree | 581c64936f0a857dd1f0fbf75c7a4ddf243d8656 /openpgp/src/serialize | |
| parent | 2b2b5c8905d0e823d03b5ba2a115298e80e08b74 (diff) | |
openpgp: Change KeyIter to return a struct instead of a tuple.
- A tuple is just an unnamed, inflexible struct. Use a struct
instead.
- Fixes #400.
Diffstat (limited to 'openpgp/src/serialize')
| -rw-r--r-- | openpgp/src/serialize/stream.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index 6c6d2c78..a3204bca 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -228,7 +228,7 @@ impl<'a> Signer<'a> { /// # let tsk = Cert::from_bytes(&include_bytes!( /// # "../../tests/data/keys/testy-new-private.pgp")[..]) /// # .unwrap(); - /// # let keypair = tsk.keys_valid().for_signing().nth(0).unwrap().2 + /// # let keypair = tsk.keys_valid().for_signing().nth(0).unwrap().key() /// # .clone().mark_parts_secret().unwrap().into_keypair().unwrap(); /// # f(tsk, keypair).unwrap(); /// # fn f(cert: Cert, mut signing_keypair: KeyPair) @@ -331,7 +331,7 @@ impl<'a> Signer<'a> { /// # let tsk = Cert::from_bytes(&include_bytes!( /// # "../../tests/data/keys/testy-new-private.pgp")[..]) /// # .unwrap(); - /// # let keypair = tsk.keys_valid().for_signing().nth(0).unwrap().2 + /// # let keypair = tsk.keys_valid().for_signing().nth(0).unwrap().key() /// # .clone().mark_parts_secret().unwrap().into_keypair().unwrap(); /// # f(tsk, keypair).unwrap(); /// # fn f(cert: Cert, mut signing_keypair: KeyPair) @@ -987,7 +987,7 @@ impl<'a> Encryptor<'a> { /// .key_flags(KeyFlags::default() /// .set_storage_encryption(true) /// .set_transport_encryption(true)) - /// .map(|(_, _, key)| key.into()) + /// .map(|ka| ka.key().into()) /// .nth(0).unwrap(); /// /// let mut o = vec![]; @@ -1468,7 +1468,7 @@ mod test { Cert::from_bytes(crate::tests::key("testy-private.pgp")).unwrap(), Cert::from_bytes(crate::tests::key("testy-new-private.pgp")).unwrap(), ] { - for key in tsk.keys_all().for_signing().map(|x| x.2) + for key in tsk.keys_all().for_signing().map(|ka| ka.key()) { keys.insert(key.fingerprint(), key.clone()); } @@ -1677,7 +1677,7 @@ mod test { .key_flags( KeyFlags::default() .set_transport_encryption(true)) - .map(|(_, _, key)| key).next().unwrap() + .map(|ka| ka.key()).next().unwrap() .clone().mark_parts_secret().unwrap() .into_keypair().unwrap(); pkesks[0].decrypt(&mut keypair) @@ -1706,8 +1706,7 @@ mod test { .key_flags(KeyFlags::default() .set_storage_encryption(true) .set_transport_encryption(true)) - .map(|(_, _, key)| key.into()) - .nth(0).unwrap(); + .nth(0).unwrap().key().into(); let encryptor = Encryptor::for_recipient(m, recipient) .aead_algo(AEADAlgorithm::EAX) .build().unwrap(); |