summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@pep.foundation>2020-04-03 11:22:40 +0200
committerNeal H. Walfield <neal@pep.foundation>2020-04-03 11:34:03 +0200
commit01b0ea100da215bfdd67a857467b8ea3169a79a3 (patch)
tree52e5f6afd57a2caa3e60ad3c856733068ed1c594 /openpgp-ffi
parent72bb51dc3ba1d368cad1d833a734d39a32ba3149 (diff)
openpgp: Move key_amalgamation.rs to amalgamation/key.rs.
Diffstat (limited to 'openpgp-ffi')
-rw-r--r--openpgp-ffi/src/key_amalgamation.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openpgp-ffi/src/key_amalgamation.rs b/openpgp-ffi/src/key_amalgamation.rs
index c7a8870d..374770c2 100644
--- a/openpgp-ffi/src/key_amalgamation.rs
+++ b/openpgp-ffi/src/key_amalgamation.rs
@@ -30,7 +30,7 @@ use crate::maybe_time;
/// A local alias to appease the proc macro transformation.
type ErasedKeyAmalgamation<'a> =
- openpgp::cert::key_amalgamation::ErasedKeyAmalgamation<'a, key::UnspecifiedParts>;
+ openpgp::cert::amalgamation::ErasedKeyAmalgamation<'a, key::UnspecifiedParts>;
/// A `KeyAmalgamation` holds a `Key` and associated data.
///
@@ -43,7 +43,7 @@ pub struct KeyAmalgamation<'a>(ErasedKeyAmalgamation<'a>);
/// A local alias to appease the proc macro transformation.
type ValidErasedKeyAmalgamation<'a> =
- openpgp::cert::key_amalgamation::ValidErasedKeyAmalgamation<'a, key::UnspecifiedParts>;
+ openpgp::cert::amalgamation::ValidErasedKeyAmalgamation<'a, key::UnspecifiedParts>;
/// Returns a reference to the `Key`.
#[::sequoia_ffi_macros::extern_fn] #[no_mangle]