diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2020-04-03 21:50:10 +0200 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2020-04-03 21:50:10 +0200 |
| commit | 488985f8f2e119c553f2d03d8bd87d49f45d8227 (patch) | |
| tree | cdccc226c38ed65f78a08a73ea5943665d54392f /openpgp/src/cert/amalgamation.rs | |
| parent | 6dfc495afcbb1e376eee7ac62f5e13e9299bc44e (diff) | |
openpgp: Rename ComponentBundleIter to ComponentAmalgamationIter.
- Rename `ComponentBundleIter` to `ComponentAmalgamationIter` and
`ValidComponentBundleIter` to `ValidComponentAmalgamationIter`.
- Move module from cert::bundle to cert::amalgamation.
- Fixes 8ebaf6e4ada1cea0b9e6f6dfee61c22cfdc9748c.
Diffstat (limited to 'openpgp/src/cert/amalgamation.rs')
| -rw-r--r-- | openpgp/src/cert/amalgamation.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs index 0ba7a808..8f5c46e9 100644 --- a/openpgp/src/cert/amalgamation.rs +++ b/openpgp/src/cert/amalgamation.rs @@ -35,11 +35,19 @@ use crate::{ }, }; + +mod iter; +pub use iter::{ + ComponentAmalgamationIter, + ValidComponentAmalgamationIter, +}; + mod keyiter; pub use keyiter::{ KeyAmalgamationIter, ValidKeyAmalgamationIter, }; + mod key; pub use key::{ ErasedKeyAmalgamation, @@ -584,7 +592,7 @@ impl<'a, C> ValidComponentAmalgamation<'a, C> /// Returns the amalgamated primary component at time `time` /// /// If `time` is None, then the current time is used. - /// `ValidComponentBundleIter` for the definition of a valid component. + /// `ValidComponentAmalgamationIter` for the definition of a valid component. /// /// The primary component is determined by taking the components that /// are alive at time `t`, and sorting them as follows: |