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 /ipc/tests | |
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 'ipc/tests')
-rw-r--r-- | ipc/tests/gpg-agent.rs | 14 |
1 files changed, 7 insertions, 7 deletions
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 { () => {{ |