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.

2 files changed, 26 insertions, 26 deletions

diff --git a/openpgp-ffi/src/parse/mod.rs b/openpgp-ffi/src/parse/mod.rs
index d1b953d1..c030e6a0 100644
--- a/openpgp-ffi/src/parse/mod.rs
+++ b/openpgp-ffi/src/parse/mod.rs
@@ -25,9 +25,9 @@ use self::openpgp::parse::{
 };
 
 use super::io::Reader;
-use error::Status;
-use MoveIntoRaw;
-use RefMutRaw;
+use crate::error::Status;
+use crate::MoveIntoRaw;
+use crate::RefMutRaw;
 
 pub mod stream;
 
@@ -38,7 +38,7 @@ pub mod stream;
 /// the stream.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_from_reader<'a>
-    (errp: Option<&mut *mut ::error::Error>, reader: *mut Reader)
+    (errp: Option<&mut *mut crate::error::Error>, reader: *mut Reader)
      -> *mut PacketParserResult<'a> {
     ffi_make_fry_from_errp!(errp);
     let reader = reader.ref_mut_raw();
@@ -51,7 +51,7 @@ pub extern "C" fn pgp_packet_parser_from_reader<'a>
 /// the stream.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_from_file
-    (errp: Option<&mut *mut ::error::Error>, filename: *const c_char)
+    (errp: Option<&mut *mut crate::error::Error>, filename: *const c_char)
      -> *mut PacketParserResult<'static> {
     ffi_make_fry_from_errp!(errp);
     let filename = ffi_param_cstr!(filename).to_string_lossy().into_owned();
@@ -64,7 +64,7 @@ pub extern "C" fn pgp_packet_parser_from_file
 /// the stream.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_from_bytes
-    (errp: Option<&mut *mut ::error::Error>, b: *const u8, len: size_t)
+    (errp: Option<&mut *mut crate::error::Error>, b: *const u8, len: size_t)
      -> *mut PacketParserResult<'static> {
     ffi_make_fry_from_errp!(errp);
     assert!(!b.is_null());
@@ -92,7 +92,7 @@ pub extern "C" fn pgp_packet_parser_free(pp: Option<&mut PacketParser>) {
 /// Frees the packet parser EOF object.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_eof_is_message(
-    errp: Option<&mut *mut ::error::Error>,
+    errp: Option<&mut *mut crate::error::Error>,
     eof: *const PacketParserEOF) -> bool
 {
     ffi_make_fry_from_errp!(errp);
@@ -199,7 +199,7 @@ pub extern "C" fn pgp_packet_parser_recursion_depth
 /// Consumes the given packet parser.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_next<'a>
-    (errp: Option<&mut *mut ::error::Error>,
+    (errp: Option<&mut *mut crate::error::Error>,
      pp: *mut PacketParser<'a>,
      old_packet: Option<&mut *mut Packet>,
      ppr: Option<&mut *mut PacketParserResult<'a>>)
@@ -243,7 +243,7 @@ pub extern "C" fn pgp_packet_parser_next<'a>
 /// Consumes the given packet parser.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_recurse<'a>
-    (errp: Option<&mut *mut ::error::Error>,
+    (errp: Option<&mut *mut crate::error::Error>,
      pp: *mut PacketParser<'a>,
      old_packet: Option<&mut *mut Packet>,
      ppr: Option<&mut *mut PacketParserResult<'a>>)
@@ -273,7 +273,7 @@ pub extern "C" fn pgp_packet_parser_recurse<'a>
 /// content is small.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_buffer_unread_content<'a>
-    (errp: Option<&mut *mut ::error::Error>,
+    (errp: Option<&mut *mut crate::error::Error>,
      pp: *mut PacketParser<'a>,
      len: *mut usize)
      -> *const u8 {
@@ -291,7 +291,7 @@ pub extern "C" fn pgp_packet_parser_buffer_unread_content<'a>
 /// `PacketParserBuild` to customize the default behavior.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_finish<'a>
-    (errp: Option<&mut *mut ::error::Error>, pp: *mut PacketParser<'a>,
+    (errp: Option<&mut *mut crate::error::Error>, pp: *mut PacketParser<'a>,
      packet: Option<&mut *const Packet>)
      -> Status
 {
@@ -325,7 +325,7 @@ pub extern "C" fn pgp_packet_parser_finish<'a>
 /// returns `Error::InvalidOperation`.
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle]
 pub extern "C" fn pgp_packet_parser_decrypt<'a>
-    (errp: Option<&mut *mut ::error::Error>,
+    (errp: Option<&mut *mut crate::error::Error>,
      pp: *mut PacketParser<'a>,
      algo: u8, // XXX
      key: *const u8, key_len: size_t)
diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs
index f31124aa..f9128b39 100644
--- a/openpgp-ffi/src/parse/stream.rs
+++ b/openpgp-ffi/src/parse/stream.rs
@@ -33,12 +33,12 @@ use self::openpgp::parse::stream::{
     DetachedVerifier,
 };
 
-use Maybe;
-use MoveFromRaw;
-use MoveIntoRaw;
-use MoveResultIntoRaw;
-use RefRaw;
-use RefMutRaw;
+use crate::Maybe;
+use crate::MoveFromRaw;
+use crate::MoveIntoRaw;
+use crate::MoveResultIntoRaw;
+use crate::RefRaw;
+use crate::RefMutRaw;
 
 use super::super::{
     error::Status,
@@ -53,7 +53,7 @@ use super::super::{
 };
 
 /// Communicates the message structure to the VerificationHelper.
-#[::ffi_wrapper_type(prefix = "pgp_", derive = "Debug")]
+#[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Debug")]
 pub struct MessageStructure<'a>(stream::MessageStructure<'a>);
 
 /// Iterates over the message structure.
@@ -64,11 +64,11 @@ fn pgp_message_structure_iter(structure: *const MessageStructure)
 }
 
 /// Iterates over the message structure.
-#[::ffi_wrapper_type(prefix = "pgp_", derive = "Iterator(MessageLayer)")]
+#[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Iterator(MessageLayer)")]
 pub struct MessageStructureIter<'a>(stream::MessageStructureIter<'a>);
 
 /// Represents a layer of the message structure.
-#[::ffi_wrapper_type(prefix = "pgp_", derive = "Debug")]
+#[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Debug")]
 pub struct MessageLayer<'a>(stream::MessageLayer<'a>);
 
 /// Returns the message layer variant.
@@ -154,12 +154,12 @@ fn pgp_message_layer_signature_group<'a>(
 }
 
 /// A message's verification results.
-#[::ffi_wrapper_type(prefix = "pgp_", derive = "Iterator(VerificationResult)")]
+#[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Iterator(VerificationResult)")]
 pub struct VerificationResultIter<'a>(
     ::std::slice::Iter<'a, stream::VerificationResult<'a>>);
 
 /// A message's verification results.
-#[::ffi_wrapper_type(prefix = "pgp_", derive = "Debug")]
+#[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Debug")]
 pub struct VerificationResult<'a>(stream::VerificationResult<'a>);
 
 /// Returns the verification result variant.
@@ -499,7 +499,7 @@ impl VerificationHelper for VHelper {
 /// }
 /// ```
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C"
-fn pgp_verifier_new<'a>(errp: Option<&mut *mut ::error::Error>,
+fn pgp_verifier_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                         input: *mut io::Reader,
                         get_public_keys: GetPublicKeysCallback,
                         check: CheckCallback,
@@ -625,7 +625,7 @@ fn maybe_time(t: time_t) -> Option<time::Tm> {
 /// }
 /// ```
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C"
-fn pgp_detached_verifier_new<'a>(errp: Option<&mut *mut ::error::Error>,
+fn pgp_detached_verifier_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                                  signature_input: *mut io::Reader,
                                  input: *mut io::Reader,
                                  get_public_keys: GetPublicKeysCallback,
@@ -898,7 +898,7 @@ impl DecryptionHelper for DHelper {
 /// }
 /// ```
 #[::sequoia_ffi_macros::extern_fn] #[no_mangle] pub extern "C"
-fn pgp_decryptor_new<'a>(errp: Option<&mut *mut ::error::Error>,
+fn pgp_decryptor_new<'a>(errp: Option<&mut *mut crate::error::Error>,
                          input: *mut io::Reader,
                          get_public_keys: GetPublicKeysCallback,
                          decrypt: DecryptCallback,