diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2020-10-01 12:06:14 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2020-10-02 15:09:10 +0200 |
| commit | 46f9d859b56cfbbf8a0e41d76f2d0abaa055b73d (patch) | |
| tree | 25cfaa36095be4568119fa555c14be84738b8a5f /openpgp/src/serialize | |
| parent | 23cb4b184b8c710d5c54bd45dbad206d59ae36b3 (diff) | |
openpgp: Rename Cert::merge_packets to Cert::insert_packets.
- This is closer to collection types such as HashMap, and
distinguishes the function from Cert::merge that merges two
certificates.
- See #572.
Diffstat (limited to 'openpgp/src/serialize')
| -rw-r--r-- | openpgp/src/serialize/cert.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openpgp/src/serialize/cert.rs b/openpgp/src/serialize/cert.rs index b22ddccc..263b875d 100644 --- a/openpgp/src/serialize/cert.rs +++ b/openpgp/src/serialize/cert.rs @@ -797,7 +797,7 @@ mod test { .preserve_signature_creation_time().unwrap() .set_exportable_certification(false).unwrap()).unwrap(); - let cert = cert.merge_packets(vec![ + let cert = cert.insert_packets(vec![ Packet::SecretSubkey(key), key_binding.into(), uid.into(), uid_binding.into(), ua.into(), ua_binding.into(), |