From 775f0c039349335df880d35db7df6c131419f0eb Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Tue, 9 Jul 2019 12:51:10 +0200
Subject: 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.
---
 store/src/backend/mod.rs | 12 ++++++------
 store/src/lib.rs         | 14 +++++++-------
 store/src/macros.rs      |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'store')

diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index 7753db58..4ecc3aed 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -21,14 +21,14 @@ use tokio_core::reactor::{Handle, Timeout};
 use tokio_core;
 use tokio_io::io::ReadHalf;
 
-use openpgp::{self, TPK, KeyID, Fingerprint};
-use openpgp::parse::Parse;
-use openpgp::serialize::Serialize;
+use crate::openpgp::{self, TPK, KeyID, Fingerprint};
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::Serialize;
 use sequoia_core as core;
 use sequoia_net as net;
 use sequoia_ipc as ipc;
 
-use store_protocol_capnp::node;
+use crate::store_protocol_capnp::node;
 
 use super::Result;
 
@@ -877,7 +877,7 @@ impl KeyServer {
                      network_policy: core::NetworkPolicy)
                      -> Result<(KeyServer,
                                 openpgp::KeyID,
-                                net::async::KeyServer)> {
+                                net::r#async::KeyServer)> {
         assert!(network_policy != core::NetworkPolicy::Offline);
         let network_policy_u8 = u8::from(&network_policy);
 
@@ -896,7 +896,7 @@ impl KeyServer {
 
         let ctx = core::Context::configure()
             .network_policy(network_policy).build()?;
-        let keyserver = net::async::KeyServer::sks_pool(&ctx)?;
+        let keyserver = net::r#async::KeyServer::sks_pool(&ctx)?;
 
         Ok((KeyServer::new(c.clone(), id),
             fingerprint.to_keyid(),
diff --git a/store/src/lib.rs b/store/src/lib.rs
index d9063bf7..2dd00361 100644
--- a/store/src/lib.rs
+++ b/store/src/lib.rs
@@ -79,17 +79,17 @@ extern crate sequoia_core;
 extern crate sequoia_ipc;
 extern crate sequoia_net;
 
-use openpgp::Fingerprint;
-use openpgp::KeyID;
-use openpgp::TPK;
-use openpgp::parse::Parse;
-use openpgp::serialize::Serialize;
+use crate::openpgp::Fingerprint;
+use crate::openpgp::KeyID;
+use crate::openpgp::TPK;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::Serialize;
 use sequoia_core as core;
 use sequoia_core::Context;
 use sequoia_ipc as ipc;
 
 #[allow(dead_code)] mod store_protocol_capnp;
-use store_protocol_capnp::node;
+use crate::store_protocol_capnp::node;
 
 /// Macros managing requests and responses.
 #[macro_use] mod macros;
@@ -1234,7 +1234,7 @@ impl From<capnp::NotInSchema> for Error {
 #[cfg(test)]
 mod test {
     use super::*;
-    use openpgp::parse::Parse;
+    use crate::openpgp::parse::Parse;
 
     macro_rules! bytes {
         ( $x:expr ) => { include_bytes!(concat!("../../openpgp/tests/data/keys/", $x)) };
diff --git a/store/src/macros.rs b/store/src/macros.rs
index a828313d..11d5772b 100644
--- a/store/src/macros.rs
+++ b/store/src/macros.rs
@@ -12,7 +12,7 @@
 // Sends the given request and decodes the result.
 macro_rules! make_request {
     ( $core: expr, $request: expr ) => {{
-        use node::result::Which;
+        use crate::node::result::Which;
 
         let r: std::result::Result<Result<_>, capnp::Error> = $core.run(
             $request.send().promise
@@ -34,7 +34,7 @@ macro_rules! make_request {
 
 macro_rules! make_request_map {
     ( $core: expr, $request: expr, $map: expr ) => {{
-        use node::result::Which;
+        use crate::node::result::Which;
 
         let r: std::result::Result<Result<_>, capnp::Error> = $core.run(
             $request.send().promise
-- 
cgit v1.2.3