diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-07-09 12:51:10 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-07-15 12:47:53 +0200 |
commit | 775f0c039349335df880d35db7df6c131419f0eb (patch) | |
tree | 2d16928f3a629b7afae95cf1b9d518c5603a9f93 /openpgp-ffi/src/packet/key.rs | |
parent | caec575e3c44e6045e29aa452ad31f91d04ec139 (diff) |
Prepare for Rust 2018.
- This is the result of running `cargo fix --edition`, with some
manual adjustments.
- The vast majority of changes merely qualify module paths with
'crate::'.
- Two instances of adding an anonymous pattern to a trait's
function.
- `async` is a keyword in Rust 2018, and hence it needs to be
escaped (e.g. in the case of the net::r#async module).
- The manual adjustments were needed due to various shortcomings of
the analysis employed by `cargo fix`, e.g. unexpanded macros,
procedural macros, lalrpop grammars.
Diffstat (limited to 'openpgp-ffi/src/packet/key.rs')
-rw-r--r-- | openpgp-ffi/src/packet/key.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openpgp-ffi/src/packet/key.rs b/openpgp-ffi/src/packet/key.rs index 6e14971a..c824363d 100644 --- a/openpgp-ffi/src/packet/key.rs +++ b/openpgp-ffi/src/packet/key.rs @@ -10,9 +10,9 @@ extern crate sequoia_openpgp as openpgp; use super::super::fingerprint::Fingerprint; use super::super::keyid::KeyID; -use MoveFromRaw; -use MoveIntoRaw; -use RefRaw; +use crate::MoveFromRaw; +use crate::MoveIntoRaw; +use crate::RefRaw; /// Holds a public key, public subkey, private key or private subkey packet. /// @@ -23,7 +23,7 @@ use RefRaw; /// Wraps [`sequoia-openpgp::packet::key::Key`]. /// /// [`sequoia-openpgp::packet::key::Key`]: ../../sequoia_openpgp/packet/key/struct.Key.html -#[::ffi_wrapper_type(prefix = "pgp_", +#[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, PartialEq, Parse")] pub struct Key(openpgp::packet::Key); @@ -71,7 +71,7 @@ fn pgp_key_public_key_bits(key: *const Key) -> c_int { /// /// Fails if the secret key is missing, or encrypted. #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C" -fn pgp_key_into_key_pair(errp: Option<&mut *mut ::error::Error>, +fn pgp_key_into_key_pair(errp: Option<&mut *mut crate::error::Error>, key: *mut Key) -> *mut self::openpgp::crypto::KeyPair { ffi_make_fry_from_errp!(errp); |