summaryrefslogtreecommitdiffstats
path: root/openpgp/src/cert/key_amalgamation.rs
diff options
context:
space:
mode:
Diffstat (limited to 'openpgp/src/cert/key_amalgamation.rs')
-rw-r--r--openpgp/src/cert/key_amalgamation.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/openpgp/src/cert/key_amalgamation.rs b/openpgp/src/cert/key_amalgamation.rs
index 6209ddce..f0e5c50b 100644
--- a/openpgp/src/cert/key_amalgamation.rs
+++ b/openpgp/src/cert/key_amalgamation.rs
@@ -7,8 +7,8 @@ use failure::ResultExt;
use crate::{
Cert,
cert::components::{
- Amalgamation,
KeyBundle,
+ ValidAmalgamation,
},
Error,
packet::key,
@@ -273,7 +273,8 @@ impl<'a, P: key::KeyParts> From<ValidKeyAmalgamation<'a, P>>
}
}
-impl<'a, P: 'a + key::KeyParts> Amalgamation<'a> for ValidKeyAmalgamation<'a, P>
+impl<'a, P: 'a + key::KeyParts> ValidAmalgamation<'a>
+ for ValidKeyAmalgamation<'a, P>
{
// NOTE: No docstring, because KeyAmalgamation has the same method.
// Returns the certificate that the component came from.
@@ -451,7 +452,7 @@ impl<'a, P: key::KeyParts> ValidPrimaryKeyAmalgamation<'a, P> {
}
}
-impl<'a, P: 'a + key::KeyParts> Amalgamation<'a>
+impl<'a, P: 'a + key::KeyParts> ValidAmalgamation<'a>
for ValidPrimaryKeyAmalgamation<'a, P>
{
// NOTE: No docstring, because KeyAmalgamation has the same method.