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.
---
 openpgp/src/packet/userid.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'openpgp/src/packet/userid.rs')

diff --git a/openpgp/src/packet/userid.rs b/openpgp/src/packet/userid.rs
index e0aa2713..df9f1809 100644
--- a/openpgp/src/packet/userid.rs
+++ b/openpgp/src/packet/userid.rs
@@ -3,7 +3,7 @@ use std::str;
 use std::hash::{Hash, Hasher};
 use std::cell::RefCell;
 use quickcheck::{Arbitrary, Gen};
-use rfc2822::{
+use crate::rfc2822::{
     AddrSpec,
     AddrSpecOrOther,
     Name,
@@ -12,9 +12,9 @@ use rfc2822::{
 };
 use failure::ResultExt;
 
-use Result;
-use packet;
-use Packet;
+use crate::Result;
+use crate::packet;
+use crate::Packet;
 
 struct ParsedUserID {
     name: Option<String>,
@@ -477,8 +477,8 @@ impl Arbitrary for UserID {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use parse::Parse;
-    use serialize::SerializeInto;
+    use crate::parse::Parse;
+    use crate::serialize::SerializeInto;
 
     quickcheck! {
         fn roundtrip(p: UserID) -> bool {
-- 
cgit v1.2.3