summaryrefslogtreecommitdiffstats
path: root/openpgp
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
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')
-rw-r--r--openpgp/examples/decrypt-with.rs6
-rw-r--r--openpgp/examples/encrypt-for.rs8
-rw-r--r--openpgp/examples/generate-encrypt-decrypt.rs8
-rw-r--r--openpgp/examples/generate-sign-verify.rs4
-rw-r--r--openpgp/examples/notarize.rs4
-rw-r--r--openpgp/examples/sign-detached.rs8
-rw-r--r--openpgp/examples/sign.rs10
-rw-r--r--openpgp/examples/statistics.rs16
-rw-r--r--openpgp/examples/web-of-trust.rs4
-rw-r--r--openpgp/examples/wrap-literal.rs6
-rw-r--r--openpgp/src/armor.rs10
-rw-r--r--openpgp/src/autocrypt.rs36
-rw-r--r--openpgp/src/constants.rs10
-rw-r--r--openpgp/src/conversions.rs12
-rw-r--r--openpgp/src/crypto/aead.rs20
-rw-r--r--openpgp/src/crypto/asymmetric.rs22
-rw-r--r--openpgp/src/crypto/ecdh.rs20
-rw-r--r--openpgp/src/crypto/hash.rs36
-rw-r--r--openpgp/src/crypto/keygrip.rs22
-rw-r--r--openpgp/src/crypto/mod.rs12
-rw-r--r--openpgp/src/crypto/mpis.rs38
-rw-r--r--openpgp/src/crypto/s2k.rs28
-rw-r--r--openpgp/src/crypto/sexp.rs28
-rw-r--r--openpgp/src/crypto/symmetric.rs20
-rw-r--r--openpgp/src/fingerprint.rs8
-rw-r--r--openpgp/src/keyid.rs10
-rw-r--r--openpgp/src/lib.rs12
-rw-r--r--openpgp/src/macros.rs24
-rw-r--r--openpgp/src/message/grammar.lalrpop2
-rw-r--r--openpgp/src/message/mod.rs54
-rw-r--r--openpgp/src/packet/aed.rs10
-rw-r--r--openpgp/src/packet/compressed_data.rs8
-rw-r--r--openpgp/src/packet/ctb.rs4
-rw-r--r--openpgp/src/packet/header.rs6
-rw-r--r--openpgp/src/packet/key.rs88
-rw-r--r--openpgp/src/packet/literal.rs16
-rw-r--r--openpgp/src/packet/marker.rs8
-rw-r--r--openpgp/src/packet/mdc.rs6
-rw-r--r--openpgp/src/packet/mod.rs12
-rw-r--r--openpgp/src/packet/one_pass_sig.rs24
-rw-r--r--openpgp/src/packet/pkesk.rs74
-rw-r--r--openpgp/src/packet/prelude.rs4
-rw-r--r--openpgp/src/packet/seip.rs4
-rw-r--r--openpgp/src/packet/signature/mod.rs84
-rw-r--r--openpgp/src/packet/signature/subpacket.rs40
-rw-r--r--openpgp/src/packet/skesk.rs24
-rw-r--r--openpgp/src/packet/tag.rs2
-rw-r--r--openpgp/src/packet/trust.rs10
-rw-r--r--openpgp/src/packet/unknown.rs6
-rw-r--r--openpgp/src/packet/user_attribute.rs18
-rw-r--r--openpgp/src/packet/userid.rs12
-rw-r--r--openpgp/src/packet_pile.rs48
-rw-r--r--openpgp/src/parse/hashed_reader.rs10
-rw-r--r--openpgp/src/parse/mpis.rs20
-rw-r--r--openpgp/src/parse/packet_parser_builder.rs26
-rw-r--r--openpgp/src/parse/packet_pile_parser.rs10
-rw-r--r--openpgp/src/parse/parse.rs110
-rw-r--r--openpgp/src/parse/partial_body.rs4
-rw-r--r--openpgp/src/parse/sexp/grammar.lalrpop4
-rw-r--r--openpgp/src/parse/sexp/mod.rs20
-rw-r--r--openpgp/src/parse/stream.rs50
-rw-r--r--openpgp/src/serialize/mod.rs44
-rw-r--r--openpgp/src/serialize/partial_body.rs8
-rw-r--r--openpgp/src/serialize/sexp.rs6
-rw-r--r--openpgp/src/serialize/stream.rs24
-rw-r--r--openpgp/src/serialize/tpk.rs18
-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
-rw-r--r--openpgp/src/tpk/armor.rs16
-rw-r--r--openpgp/src/tpk/bindings.rs12
-rw-r--r--openpgp/src/tpk/builder.rs48
-rw-r--r--openpgp/src/tpk/grammar.lalrpop22
-rw-r--r--openpgp/src/tpk/lexer.rs14
-rw-r--r--openpgp/src/tpk/mod.rs90
-rw-r--r--openpgp/tests/for-each-artifact.rs4
76 files changed, 788 insertions, 788 deletions
diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs
index 75b886eb..6562b3db 100644
--- a/openpgp/examples/decrypt-with.rs
+++ b/openpgp/examples/decrypt-with.rs
@@ -8,9 +8,9 @@ use std::io;
extern crate failure;
extern crate sequoia_openpgp as openpgp;
-use openpgp::crypto::{KeyPair, SessionKey};
-use openpgp::constants::SymmetricAlgorithm;
-use openpgp::parse::{
+use crate::openpgp::crypto::{KeyPair, SessionKey};
+use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::parse::{
Parse,
stream::{
DecryptionHelper,
diff --git a/openpgp/examples/encrypt-for.rs b/openpgp/examples/encrypt-for.rs
index 3fd1217c..9b35623b 100644
--- a/openpgp/examples/encrypt-for.rs
+++ b/openpgp/examples/encrypt-for.rs
@@ -5,10 +5,10 @@ use std::env;
use std::io;
extern crate sequoia_openpgp as openpgp;
-use openpgp::armor;
-use openpgp::constants::DataFormat;
-use openpgp::parse::Parse;
-use openpgp::serialize::stream::{
+use crate::openpgp::armor;
+use crate::openpgp::constants::DataFormat;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::stream::{
Message, LiteralWriter, Encryptor, EncryptionMode,
};
diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs
index 8a450d24..50159825 100644
--- a/openpgp/examples/generate-encrypt-decrypt.rs
+++ b/openpgp/examples/generate-encrypt-decrypt.rs
@@ -3,10 +3,10 @@
use std::io::{self, Write};
extern crate sequoia_openpgp as openpgp;
-use openpgp::crypto::SessionKey;
-use openpgp::constants::SymmetricAlgorithm;
-use openpgp::serialize::stream::*;
-use openpgp::parse::stream::*;
+use crate::openpgp::crypto::SessionKey;
+use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::serialize::stream::*;
+use crate::openpgp::parse::stream::*;
const MESSAGE: &'static str = "дружба";
diff --git a/openpgp/examples/generate-sign-verify.rs b/openpgp/examples/generate-sign-verify.rs
index 70899c81..cc350a63 100644
--- a/openpgp/examples/generate-sign-verify.rs
+++ b/openpgp/examples/generate-sign-verify.rs
@@ -4,8 +4,8 @@ use std::io::{self, Write};
extern crate failure;
extern crate sequoia_openpgp as openpgp;
-use openpgp::serialize::stream::*;
-use openpgp::parse::stream::*;
+use crate::openpgp::serialize::stream::*;
+use crate::openpgp::parse::stream::*;
const MESSAGE: &'static str = "дружба";
diff --git a/openpgp/examples/notarize.rs b/openpgp/examples/notarize.rs
index fd1c56b1..54c7fa79 100644
--- a/openpgp/examples/notarize.rs
+++ b/openpgp/examples/notarize.rs
@@ -5,7 +5,7 @@ use std::env;
use std::io;
extern crate sequoia_openpgp as openpgp;
-use openpgp::{
+use crate::openpgp::{
armor,
crypto,
Packet,
@@ -13,7 +13,7 @@ use openpgp::{
parse::{Parse, PacketParserResult},
serialize::Serialize,
};
-use openpgp::serialize::stream::{Message, LiteralWriter, Signer};
+use crate::openpgp::serialize::stream::{Message, LiteralWriter, Signer};
fn main() {
let args: Vec<String> = env::args().collect();
diff --git a/openpgp/examples/sign-detached.rs b/openpgp/examples/sign-detached.rs
index a4ee95ad..30620eb3 100644
--- a/openpgp/examples/sign-detached.rs
+++ b/openpgp/examples/sign-detached.rs
@@ -5,10 +5,10 @@ use std::io;
extern crate rpassword;
extern crate sequoia_openpgp as openpgp;
-use openpgp::armor;
-use openpgp::crypto;
-use openpgp::parse::Parse;
-use openpgp::serialize::stream::{Message, Signer};
+use crate::openpgp::armor;
+use crate::openpgp::crypto;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::stream::{Message, Signer};
fn main() {
let args: Vec<String> = env::args().collect();
diff --git a/openpgp/examples/sign.rs b/openpgp/examples/sign.rs
index 637679ab..cfd9c136 100644
--- a/openpgp/examples/sign.rs
+++ b/openpgp/examples/sign.rs
@@ -4,11 +4,11 @@ use std::env;
use std::io;
extern crate sequoia_openpgp as openpgp;
-use openpgp::armor;
-use openpgp::crypto;
-use openpgp::constants::DataFormat;
-use openpgp::parse::Parse;
-use openpgp::serialize::stream::{Message, LiteralWriter, Signer};
+use crate::openpgp::armor;
+use crate::openpgp::crypto;
+use crate::openpgp::constants::DataFormat;
+use crate::openpgp::parse::Parse;
+use crate::openpgp::serialize::stream::{Message, LiteralWriter, Signer};
fn main() {
let args: Vec<String> = env::args().collect();
diff --git a/openpgp/examples/statistics.rs b/openpgp/examples/statistics.rs
index 00bbadba..9bfdd94e 100644
--- a/openpgp/examples/statistics.rs
+++ b/openpgp/examples/statistics.rs
@@ -9,10 +9,10 @@
use std::env;
extern crate sequoia_openpgp as openpgp;
-use openpgp::Packet;
-use openpgp::constants::SignatureType;
-use openpgp::packet::{user_attribute, BodyLength, Tag};
-use openpgp::parse::{Parse, PacketParserResult, PacketParser};
+use crate::openpgp::Packet;
+use crate::openpgp::constants::SignatureType;
+use crate::openpgp::packet::{user_attribute, BodyLength, Tag};
+use crate::openpgp::parse::{Parse, PacketParserResult, PacketParser};
fn main() {
let args: Vec<String> = env::args().collect();
@@ -95,7 +95,7 @@ fn main() {
for (_offset, len, sub) in sig.hashed_area().iter()
.chain(sig.unhashed_area().iter())
{
- use openpgp::packet::signature::subpacket::*;
+ use crate::openpgp::packet::signature::subpacket::*;
let i = u8::from(sub.tag) as usize;
sigs_subpacket_tags_count[i] += 1;
if let SubpacketValue::Unknown(_) = sub.value {
@@ -116,8 +116,8 @@ fn main() {
},
Packet::UserAttribute(ref ua) => {
- use user_attribute::Subpacket;
- use user_attribute::Image;
+ use crate::user_attribute::Subpacket;
+ use crate::user_attribute::Image;
for subpacket in ua.subpackets() {
match subpacket {
Ok(Subpacket::Image(i)) => match i {
@@ -215,7 +215,7 @@ fn main() {
----------------------");
for t in 0..256 {
- use openpgp::packet::signature::subpacket::SubpacketTag;
+ use crate::openpgp::packet::signature::subpacket::SubpacketTag;
let count = sigs_subpacket_tags_count[t];
let size_count = sigs_subpacket_tags_size_count[t];
let tag_name = format!("{:?}", SubpacketTag::from(t as u8));
diff