diff options
| author | Neal H. Walfield <neal@pep.foundation> | 2020-02-20 13:26:01 +0100 |
|---|---|---|
| committer | Neal H. Walfield <neal@pep.foundation> | 2020-02-20 16:19:46 +0100 |
| commit | 2164d2e3db8c66ab98164465eaf821eb7765a760 (patch) | |
| tree | 081b05d1d974b972d339d0ab61f74fadecf9f1a5 /openpgp-ffi | |
| parent | f35f03635b319ece2c93f43db96ddc7cb30b5236 (diff) | |
openpgp: Rename the Amalgamation trait to ValidAmalgamation.
- The Amalgamation trait only applies to ValidComponents. Rename it
accordingly.
Diffstat (limited to 'openpgp-ffi')
| -rw-r--r-- | openpgp-ffi/src/cert.rs | 2 | ||||
| -rw-r--r-- | openpgp-ffi/src/parse/stream.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs index 0c4b2e83..988e958f 100644 --- a/openpgp-ffi/src/cert.rs +++ b/openpgp-ffi/src/cert.rs @@ -23,10 +23,10 @@ use self::openpgp::{ CertParser, CertRevocationBuilder, components::{ - Amalgamation, KeyIter, UserIDBundle, UserIDBundleIter, + ValidAmalgamation, ValidKeyIter, }, }, diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs index 6e549352..9c6a8de5 100644 --- a/openpgp-ffi/src/parse/stream.rs +++ b/openpgp-ffi/src/parse/stream.rs @@ -16,7 +16,7 @@ use libc::{c_int, c_void, time_t}; extern crate sequoia_openpgp as openpgp; use self::openpgp::{ - cert::components::Amalgamation, + cert::components::ValidAmalgamation, crypto::SessionKey, types::SymmetricAlgorithm, packet::{ |