summaryrefslogtreecommitdiffstats
path: root/openpgp/src/serialize/writer
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-07-09 12:51:10 +0200
committerJustus Winter <justus@sequoia-pgp.org>2019-07-15 12:47:53 +0200
commit775f0c039349335df880d35db7df6c131419f0eb (patch)
tree2d16928f3a629b7afae95cf1b9d518c5603a9f93 /openpgp/src/serialize/writer
parentcaec575e3c44e6045e29aa452ad31f91d04ec139 (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 'openpgp/src/serialize/writer')
-rw-r--r--openpgp/src/serialize/writer/mod.rs6
-rw-r--r--openpgp/src/serialize/writer/writer_bzip2.rs2
-rw-r--r--openpgp/src/serialize/writer/writer_deflate.rs2
3 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/serialize/writer/mod.rs b/openpgp/src/serialize/writer/mod.rs
index a02339b0..a982d8ac 100644
--- a/openpgp/src/serialize/writer/mod.rs
+++ b/openpgp/src/serialize/writer/mod.rs
@@ -12,12 +12,12 @@ pub use self::writer_deflate::{ZIP, ZLIB};
use std::fmt;
use std::io;
-use crypto::{aead, symmetric};
-use constants::{
+use crate::crypto::{aead, symmetric};
+use crate::constants::{
AEADAlgorithm,
SymmetricAlgorithm,
};
-use {
+use crate::{
Result,
crypto::SessionKey,
};
diff --git a/openpgp/src/serialize/writer/writer_bzip2.rs b/openpgp/src/serialize/writer/writer_bzip2.rs
index 513e95e6..8f51fe18 100644
--- a/openpgp/src/serialize/writer/writer_bzip2.rs
+++ b/openpgp/src/serialize/writer/writer_bzip2.rs
@@ -3,7 +3,7 @@ use bzip2::write::BzEncoder;
use std::fmt;
use std::io;
-use Result;
+use crate::Result;
use super::{Generic, Stack, BoxStack, Stackable};
/// BZing writer.
diff --git a/openpgp/src/serialize/writer/writer_deflate.rs b/openpgp/src/serialize/writer/writer_deflate.rs
index 64e547f1..a0e1ea60 100644
--- a/openpgp/src/serialize/writer/writer_deflate.rs
+++ b/openpgp/src/serialize/writer/writer_deflate.rs
@@ -3,7 +3,7 @@ use flate2::write::{DeflateEncoder, ZlibEncoder};
use std::fmt;
use std::io;
-use Result;
+use crate::Result;
use super::{Generic, Stack, BoxStack, Stackable};
/// ZIPing writer.