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.

6 files changed, 39 insertions, 39 deletions

diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs
index 37e00a9f..b1ec3ee5 100644
--- a/tool/src/commands/decrypt.rs
+++ b/tool/src/commands/decrypt.rs
@@ -6,13 +6,13 @@ extern crate termsize;
 
 extern crate sequoia_openpgp as openpgp;
 use sequoia_core::Context;
-use openpgp::constants::SymmetricAlgorithm;
-use openpgp::conversions::hex;
-use openpgp::crypto::SessionKey;
-use openpgp::{Fingerprint, TPK, KeyID, Result};
-use openpgp::packet::{Key, key::SecretKey, Signature, PKESK, SKESK};
-use openpgp::parse::PacketParser;
-use openpgp::parse::stream::{
+use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::conversions::hex;
+use crate::openpgp::crypto::SessionKey;
+use crate::openpgp::{Fingerprint, TPK, KeyID, Result};
+use crate::openpgp::packet::{Key, key::SecretKey, Signature, PKESK, SKESK};
+use crate::openpgp::parse::PacketParser;
+use crate::openpgp::parse::stream::{
     VerificationHelper, DecryptionHelper, Decryptor, MessageStructure,
 };
 extern crate sequoia_store as store;
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index bb7257de..a1997b7c 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -4,8 +4,8 @@ use time;
 use clap;
 
 extern crate sequoia_openpgp as openpgp;
-use openpgp::{Packet, Result};
-use openpgp::parse::{Parse, PacketParserResult};
+use crate::openpgp::{Packet, Result};
+use crate::openpgp::parse::{Parse, PacketParserResult};
 
 use super::TIMEFMT;
 
@@ -27,7 +27,7 @@ pub fn inspect(m: &clap::ArgMatches, output: &mut io::Write)
     let mut literal_prefix = Vec::new();
 
     let mut ppr =
-        openpgp::parse::PacketParser::from_reader(::open_or_stdin(input)?)?;
+        openpgp::parse::PacketParser::from_reader(crate::open_or_stdin(input)?)?;
     while let PacketParserResult::Some(mut pp) = ppr {
         match pp.packet {
             Packet::PublicKey(_) | Packet::SecretKey(_) => {
@@ -212,7 +212,7 @@ fn inspect_revocation(output: &mut io::Write,
                       indent: &str,
                       revoked: openpgp::RevocationStatus)
                       -> Result<()> {
-    use openpgp::RevocationStatus::*;
+    use crate::openpgp::RevocationStatus::*;
     match revoked {
         Revoked(_) =>
             writeln!(output, "{}                 Revoked", indent)?,
@@ -251,7 +251,7 @@ fn inspect_key_flags(flags: openpgp::packet::KeyFlags) -> Option<String> {
 
 fn inspect_signatures(output: &mut io::Write,
                       sigs: &[openpgp::packet::Signature]) -> Result<()> {
-    use openpgp::constants::SignatureType::*;
+    use crate::openpgp::constants::SignatureType::*;
     for sig in sigs {
         match sig.sigtype() {
             Binary | Text => (),
diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs
index 409f3739..fefc4a75 100644
--- a/tool/src/commands/key.rs
+++ b/tool/src/commands/key.rs
@@ -3,13 +3,13 @@ use failure::Fail;
 use clap::ArgMatches;
 use itertools::Itertools;
 
-use openpgp::Packet;
-use openpgp::tpk::{TPKBuilder, CipherSuite};
-use openpgp::packet::KeyFlags;
-use openpgp::armor::{Writer, Kind};
-use openpgp::serialize::Serialize;
+use crate::openpgp::Packet;
+use crate::openpgp::tpk::{TPKBuilder, CipherSuite};
+use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::armor::{Writer, Kind};
+use crate::openpgp::serialize::Serialize;
 
-use ::create_or_stdout;
+use crate::create_or_stdout;
 
 pub fn generate(m: &ArgMatches, force: bool) -> failure::Fallible<()> {
     let mut builder = TPKBuilder::new();
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index 298295f2..c0e8ad68 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -8,19 +8,19 @@ use rpassword;
 
 extern crate sequoia_openpgp as openpgp;
 use sequoia_core::Context;
-use openpgp::constants::DataFormat;
-use openpgp::crypto;
-use openpgp::{TPK, KeyID, Result};
-use openpgp::packet::key::SecretKey;
-use openpgp::parse::{
+use crate::openpgp::constants::DataFormat;
+use crate::openpgp::crypto;
+use crate::openpgp::{TPK, KeyID, Result};
+use crate::openpgp::packet::key::SecretKey;
+use crate::openpgp::parse::{
     Parse,
     PacketParserResult,
 };
-use openpgp::parse::stream::{
+use crate::openpgp::parse::stream::{
     Verifier, DetachedVerifier, VerificationResult, VerificationHelper,
     MessageStructure, MessageLayer,
 };
-use openpgp::serialize::stream::{
+use crate::openpgp::serialize::stream::{
     Message, Signer, LiteralWriter, Encryptor, EncryptionMode,
 };
 extern crate sequoia_store as store;
diff --git a/tool/src/commands/sign.rs b/tool/src/commands/sign.rs
index fdd9c15c..3bf56daa 100644
--- a/tool/src/commands/sign.rs
+++ b/tool/src/commands/sign.rs
@@ -5,20 +5,20 @@ use std::path::PathBuf;
 use tempfile::NamedTempFile;
 
 extern crate sequoia_openpgp as openpgp;
-use openpgp::armor;
-use openpgp::constants::DataFormat;
-use openpgp::crypto;
-use openpgp::{Packet, Result};
-use openpgp::packet::Signature;
-use openpgp::parse::{
+use crate::openpgp::armor;
+use crate::openpgp::constants::DataFormat;
+use crate::openpgp::crypto;
+use crate::openpgp::{Packet, Result};
+use crate::openpgp::packet::Signature;
+use crate::openpgp::parse::{
     Parse,
     PacketParserResult,
 };
-use openpgp::serialize::Serialize;
-use openpgp::serialize::stream::{
+use crate::openpgp::serialize::Serialize;
+use crate::openpgp::serialize::stream::{
     Message, Signer, LiteralWriter,
 };
-use create_or_stdout;
+use crate::create_or_stdout;
 
 pub fn sign(input: &mut io::Read, output_path: Option<&str>,
             secrets: Vec<openpgp::TPK>, detached: bool, binary: bool,
diff --git a/tool/src/sq.rs b/tool/src/sq.rs
index 5cbb3223..408a320f 100644
--- a/tool/src/sq.rs
+++ b/tool/src/sq.rs
@@ -23,11 +23,11 @@ extern crate sequoia_core;
 extern crate sequoia_net;
 extern crate sequoia_store;
 
-use openpgp::{armor, autocrypt, Fingerprint, TPK};
-use openpgp::conversions::hex;
-use openpgp::parse::Parse;
-use openpgp::serialize::Serialize;
-use openpgp::tpk::armor::Encoder;
+use crate::openpgp::{armor, autocrypt, Fingerprint, TPK};
+use crate::openpgp::conversions::hex;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::Serialize;
+use crate::openpgp::tpk::armor::Encoder;
 use sequoia_core::{Context, NetworkPolicy};
 use sequoia_net::{KeyServer, wkd};
 use sequoia_store::{Store, LogIter};