diff options
| author | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-12-15 11:08:38 +0100 |
|---|---|---|
| committer | Wiktor Kwapisiewicz <wiktor@metacode.biz> | 2020-12-15 11:08:38 +0100 |
| commit | 4df9befdb10cc336a9df49b65fdfef659296aa61 (patch) | |
| tree | 62f5d97a982293199a2c396b838c388983c2e76c /openpgp/src/serialize/cert.rs | |
| parent | c31ceb8dab94d2ea08879e36ad450547136ca2e1 (diff) | |
openpgp: Make ComponentAmalgamation return iterator for signatures.
- Adjust `self_signatures`, `certifications`, `self_revocations` and
`other_revocations` to return `impl Iterator` over the signatures.
- Adjust all call-sites including doc tests.
- Adjust downstream projects (sq, autocrypt).
Diffstat (limited to 'openpgp/src/serialize/cert.rs')
| -rw-r--r-- | openpgp/src/serialize/cert.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/openpgp/src/serialize/cert.rs b/openpgp/src/serialize/cert.rs index 5dee3b82..1f6268fa 100644 --- a/openpgp/src/serialize/cert.rs +++ b/openpgp/src/serialize/cert.rs @@ -63,7 +63,7 @@ impl Cert { } for u in self.userids() { - if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().chain(u.self_revocations()).any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -86,7 +86,7 @@ impl Cert { } for u in self.user_attributes() { - if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().chain(u.self_revocations()).any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -109,7 +109,7 @@ impl Cert { } for k in self.subkeys() { - if export && ! k.self_signatures().iter().chain(k.self_revocations()).any( + if export && ! k.self_signatures().chain(k.self_revocations()).any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -132,7 +132,7 @@ impl Cert { } for u in self.unknowns() { - if export && ! u.certifications().iter().any( + if export && ! u.certifications().any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -546,7 +546,7 @@ impl<'a> TSK<'a> { } for u in self.cert.userids() { - if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().chain(u.self_revocations()).any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -569,7 +569,7 @@ impl<'a> TSK<'a> { } for u in self.cert.user_attributes() { - if export && ! u.self_signatures().iter().chain(u.self_revocations()).any( + if export && ! u.self_signatures().chain(u.self_revocations()).any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -592,7 +592,7 @@ impl<'a> TSK<'a> { } for k in self.cert.subkeys() { - if export && ! k.self_signatures().iter().chain(k.self_revocations()).any( + if export && ! k.self_signatures().chain(k.self_revocations()).any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. @@ -616,7 +616,7 @@ impl<'a> TSK<'a> { } for u in self.cert.unknowns() { - if export && ! u.certifications().iter().any( + if export && ! u.certifications().any( |s| s.exportable().is_ok()) { // No exportable selfsig on this component, skip it. |