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.

9 files changed, 45 insertions, 45 deletions

diff --git a/ipc/examples/assuan-client.rs b/ipc/examples/assuan-client.rs
index d92e0593..841cc754 100644
--- a/ipc/examples/assuan-client.rs
+++ b/ipc/examples/assuan-client.rs
@@ -3,7 +3,7 @@ use futures::future::Future;
 use futures::stream::Stream;
 extern crate clap;
 extern crate sequoia_ipc as ipc;
-use ipc::assuan::Client;
+use crate::ipc::assuan::Client;
 
 fn main() {
     let matches = clap::App::new("assuan-client")
diff --git a/ipc/examples/gpg-agent-client.rs b/ipc/examples/gpg-agent-client.rs
index c586cfca..836efbdb 100644
--- a/ipc/examples/gpg-agent-client.rs
+++ b/ipc/examples/gpg-agent-client.rs
@@ -5,7 +5,7 @@ use futures::future::Future;
 use futures::stream::Stream;
 extern crate clap;
 extern crate sequoia_ipc as ipc;
-use ipc::gnupg::{Context, Agent};
+use crate::ipc::gnupg::{Context, Agent};
 
 fn main() {
     let matches = clap::App::new("gpg-agent-client")
diff --git a/ipc/examples/gpg-agent-decrypt.rs b/ipc/examples/gpg-agent-decrypt.rs
index 2e423f12..8a783f7a 100644
--- a/ipc/examples/gpg-agent-decrypt.rs
+++ b/ipc/examples/gpg-agent-decrypt.rs
@@ -7,9 +7,9 @@ extern crate clap;
 extern crate sequoia_openpgp as openpgp;
 extern crate sequoia_ipc as ipc;
 
-use openpgp::crypto::SessionKey;
-use openpgp::constants::SymmetricAlgorithm;
-use openpgp::parse::{
+use crate::openpgp::crypto::SessionKey;
+use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::parse::{
     Parse,
     stream::{
         DecryptionHelper,
@@ -20,7 +20,7 @@ use openpgp::parse::{
         MessageLayer,
     },
 };
-use ipc::gnupg::{Context, KeyPair};
+use crate::ipc::gnupg::{Context, KeyPair};
 
 fn main() {
     let matches = clap::App::new("gpg-agent-decrypt")
diff --git a/ipc/examples/gpg-agent-sign.rs b/ipc/examples/gpg-agent-sign.rs
index 8525abbb..43435b46 100644
--- a/ipc/examples/gpg-agent-sign.rs
+++ b/ipc/examples/gpg-agent-sign.rs
@@ -6,11 +6,11 @@ extern crate clap;
 extern crate sequoia_openpgp as openpgp;
 extern crate sequoia_ipc as ipc;
 
-use openpgp::armor;
-use openpgp::constants::DataFormat;
-use openpgp::parse::Parse;
-use openpgp::serialize::stream::{Message, LiteralWriter, Signer};
-use ipc::gnupg::{Context, KeyPair};
+use crate::openpgp::armor;
+use crate::openpgp::constants::DataFormat;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::stream::{Message, LiteralWriter, Signer};
+use crate::ipc::gnupg::{Context, KeyPair};
 
 fn main() {
     let matches = clap::App::new("gpg-agent-sign")
diff --git a/ipc/src/assuan/grammar.lalrpop b/ipc/src/assuan/grammar.lalrpop
index 266dfeea..b51f7235 100644
--- a/ipc/src/assuan/grammar.lalrpop
+++ b/ipc/src/assuan/grammar.lalrpop
@@ -5,7 +5,7 @@
 //
 // [S-Expressions]: https://people.csail.mit.edu/rivest/Sexp.txt
 
-use assuan::{
+use crate::assuan::{
     Response,
     lexer::{self, LexicalError},
 };
diff --git a/ipc/src/assuan/mod.rs b/ipc/src/assuan/mod.rs
index e250b542..3ad88d88 100644
--- a/ipc/src/assuan/mod.rs
+++ b/ipc/src/assuan/mod.rs
@@ -14,10 +14,10 @@ use tokio::net::UnixStream;
 use tokio_io::io;
 use tokio_io::AsyncRead;
 
-use openpgp;
+use crate::openpgp;
 
-use Error;
-use Result;
+use crate::Error;
+use crate::Result;
 
 mod lexer;
 
diff --git a/ipc/src/gnupg.rs b/ipc/src/gnupg.rs
index 4236c9c4..ede757b0 100644
--- a/ipc/src/gnupg.rs
+++ b/ipc/src/gnupg.rs
@@ -12,15 +12,15 @@ use futures::{Async, Future, Stream};
 extern crate libc;
 extern crate tempfile;
 
-use openpgp::constants::HashAlgorithm;
-use openpgp::conversions::hex;
-use openpgp::crypto;
-use openpgp::crypto::sexp::Sexp;
-use openpgp::parse::Parse;
-use openpgp::serialize::Serialize;
+use crate::openpgp::constants::HashAlgorithm;
+use crate::openpgp::conversions::hex;
+use crate::openpgp::crypto;
+use crate::openpgp::crypto::sexp::Sexp;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::Serialize;
 
-use Result;
-use assuan;
+use crate::Result;
+use crate::assuan;
 
 /// A GnuPG context.
 #[derive(Debug)]
@@ -696,8 +696,8 @@ impl<'a> crypto::Signer for KeyPair<'a> {
     fn sign(&mut self, hash_algo: HashAlgorithm, digest: &[u8])
             -> Result<openpgp::crypto::mpis::Signature>
     {
-        use openpgp::constants::PublicKeyAlgorithm::*;
-        use openpgp::crypto::mpis::PublicKey;
+        use crate::openpgp::constants::PublicKeyAlgorithm::*;
+        use crate::openpgp::crypto::mpis::PublicKey;
 
         #[allow(deprecated)]
         match (self.public.pk_algo(), self.public.mpis())
@@ -727,7 +727,7 @@ impl<'a> crypto::Decryptor for KeyPair<'a> {
     fn decrypt(&mut self, ciphertext: &crypto::mpis::Ciphertext)
                -> Result<crypto::SessionKey>
     {
-        use openpgp::crypto::mpis::{PublicKey, Ciphertext};
+        use crate::openpgp::crypto::mpis::{PublicKey, Ciphertext};
 
         match (self.public.mpis(), ciphertext) {
             (PublicKey::RSA { .. }, Ciphertext::RSA { .. })
diff --git a/ipc/src/trace.rs b/ipc/src/trace.rs
index 65e5b9af..c93e1e04 100644
--- a/ipc/src/trace.rs
+++ b/ipc/src/trace.rs
@@ -35,29 +35,29 @@ macro_rules! tracer {
         // https://users.rust-lang.org/t/nested-macros-issue/8348/2
         macro_rules! t {
             ( $fmt:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, $fmt) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, $fmt) };
             ( $fmt:expr, $a:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a)) };
             ( $fmt:expr, $a:expr, $b:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr, $f:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr, $f:expr, $g:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr, $f:expr, $g:expr, $h:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr, $f:expr, $g:expr, $h:expr, $i:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h, $i)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h, $i)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr, $f:expr, $g:expr, $h:expr, $i:expr, $j:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h, $i, $j)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h, $i, $j)) };
             ( $fmt:expr, $a:expr, $b:expr, $c:expr, $d:expr, $e:expr, $f:expr, $g:expr, $h:expr, $i:expr, $j:expr, $k:expr ) =>
-            { trace!($TRACE, "{}{}: {}", ::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k)) };
+            { trace!($TRACE, "{}{}: {}", crate::trace::indent($indent as usize), $func, format!($fmt, $a, $b, $c, $d, $e, $f, $g, $h, $i, $j, $k)) };
         }
     };
 }
diff --git a/ipc/tests/gpg-agent.rs b/ipc/tests/gpg-agent.rs
index a33ea5b5..91439a67 100644
--- a/ipc/tests/gpg-agent.rs
+++ b/ipc/tests/gpg-agent.rs
@@ -7,15 +7,15 @@ use futures::future::Future;
 use futures::stream::Stream;
 
 extern crate sequoia_openpgp as openpgp;
-use openpgp::constants::SymmetricAlgorithm;
-use openpgp::crypto::SessionKey;
-use openpgp::packet::KeyFlags;
-use openpgp::parse::stream::*;
-use openpgp::serialize::{Serialize, stream::*};
-use openpgp::tpk::{TPKBuilder, CipherSuite};
+use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::crypto::SessionKey;
+use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::parse::stream::*;
+use crate::openpgp::serialize::{Serialize, stream::*};
+use crate::openpgp::tpk::{TPKBuilder, CipherSuite};
 
 extern crate sequoia_ipc as ipc;
-use ipc::gnupg::{Context, Agent, KeyPair};
+use crate::ipc::gnupg::{Context, Agent, KeyPair};
 
 macro_rules! make_context {
     () => {{