openpgp: Change key's role function names.

  - Change `mark_role_primary` to `role_into_primary`.

  - Change `mark_role_primary_ref` to `role_as_primary`.

  - Change `mark_role_subordinate` to `role_into_subordinate`.

  - Change `mark_role_subordinate_ref` to `role_as_subordinate`.

  - Change `mark_role_unspecified` to `role_into_unspecified`.

  - Change `mark_role_unspecified_ref` to `role_as_unspecified`.

  - Fixes #452.

3 files changed, 5 insertions, 5 deletions

diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs
index 9516ad75..21f082a6 100644
--- a/openpgp-ffi/src/cert.rs
+++ b/openpgp-ffi/src/cert.rs
@@ -146,7 +146,7 @@ fn pgp_cert_as_tsk(cert: *const Cert) -> *mut TSK<'static> {
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C"
 fn pgp_cert_primary_key(cert: *const Cert) -> *const Key {
     let key = cert.ref_raw().primary_key().key()
-        .parts_as_unspecified().mark_role_unspecified_ref();
+        .parts_as_unspecified().role_as_unspecified();
     key.move_into_raw()
 }
 
diff --git a/openpgp-ffi/src/key_amalgamation.rs b/openpgp-ffi/src/key_amalgamation.rs
index e2dc31c4..e85e43d3 100644
--- a/openpgp-ffi/src/key_amalgamation.rs
+++ b/openpgp-ffi/src/key_amalgamation.rs
@@ -52,7 +52,7 @@ pub extern "C" fn pgp_key_amalgamation_key<'a>(ka: *const KeyAmalgamation<'a>)
 {
     let ka = ka.ref_raw();
 
-    ka.key().parts_as_unspecified().mark_role_unspecified_ref()
+    ka.key().parts_as_unspecified().role_as_unspecified()
         .move_into_raw()
 }
 
@@ -73,7 +73,7 @@ pub extern "C" fn pgp_valid_key_amalgamation_key<'a>(ka: *const ValidKeyAmalgama
 {
     let ka = ka.ref_raw();
 
-    ka.key().parts_as_unspecified().mark_role_unspecified_ref()
+    ka.key().parts_as_unspecified().role_as_unspecified()
         .move_into_raw()
 }
 
diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs
index c3d54ec3..ae5bbe43 100644
--- a/openpgp-ffi/src/parse/stream.rs
+++ b/openpgp-ffi/src/parse/stream.rs
@@ -207,7 +207,7 @@ fn pgp_verification_result_good_checksum<'a>(
             *unsafe { p.as_mut() } = {
                 let key = ka.key()
                     .parts_as_unspecified()
-                    .mark_role_unspecified_ref();
+                    .role_as_unspecified();
                 key.move_into_raw()
             };
         }
@@ -335,7 +335,7 @@ fn $fn_name<'a>(
             *unsafe { p.as_mut() } = {
                 let key = ka.key()
                     .parts_as_unspecified()
-                    .mark_role_unspecified_ref();
+                    .role_as_unspecified();
                 key.move_into_raw()
             };
         }