From 64dbb97dfb20cba2398b30e688102ca44cd03665 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Thu, 4 Apr 2019 18:11:54 -0700
Subject: [PATCH] crate: fix other 2018 edition fudgeups

---
 src/builder.rs             |  4 ++--
 src/resolvers/hacl_star.rs | 16 +++++++---------
 src/resolvers/ring.rs      | 12 +++++-------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/builder.rs b/src/builder.rs
index 836d04f4..91d76e4f 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -66,7 +66,7 @@ impl<'builder> Builder<'builder> {
     /// Create a Builder with the ring resolver and default resolver as a fallback.
     #[cfg(feature = "ring-accelerated")]
     pub fn new(params: NoiseParams) -> Self {
-        use ::resolvers::{FallbackResolver, DefaultResolver, RingResolver};
+        use crate::resolvers::{FallbackResolver, DefaultResolver, RingResolver};
 
         Self::with_resolver(params, Box::new(FallbackResolver::new(Box::new(RingResolver), Box::new(DefaultResolver))))
     }
@@ -74,7 +74,7 @@ impl<'builder> Builder<'builder> {
     /// Create a Builder with the HACL* resolver and default resolver as a fallback.
     #[cfg(feature = "hacl-star-accelerated")]
     pub fn new(params: NoiseParams) -> Self {
-        use ::resolvers::{FallbackResolver, DefaultResolver, HaclStarResolver};
+        use crate::resolvers::{FallbackResolver, DefaultResolver, HaclStarResolver};
 
         Self::with_resolver(params, Box::new(FallbackResolver::new(Box::new(HaclStarResolver), Box::new(DefaultResolver))))
     }
diff --git a/src/resolvers/hacl_star.rs b/src/resolvers/hacl_star.rs
index 5ceacd1e..c94c29cf 100644
--- a/src/resolvers/hacl_star.rs
+++ b/src/resolvers/hacl_star.rs
@@ -1,12 +1,10 @@
-extern crate hacl_star;
-
 use std::mem;
 use super::CryptoResolver;
-use params::{DHChoice, HashChoice, CipherChoice};
-use types::{Random, Dh, Hash, Cipher};
-use self::hacl_star::curve25519::{self, SecretKey, PublicKey};
-use self::hacl_star::sha2::{Sha256, Sha512};
-use self::hacl_star::chacha20poly1305;
+use crate::params::{DHChoice, HashChoice, CipherChoice};
+use crate::types::{Random, Dh, Hash, Cipher};
+use hacl_star::curve25519::{self, SecretKey, PublicKey};
+use hacl_star::sha2::{Sha256, Sha512};
+use hacl_star::chacha20poly1305;
 
 use byteorder::{ByteOrder, LittleEndian};
 
@@ -216,10 +214,10 @@ mod tests {
 
     extern crate hex;
 
-    use types::*;
+    use crate::types::*;
     use super::*;
     use self::hex::FromHex;
-    use super::hacl_star::poly1305::Poly1305;
+    use hacl_star::poly1305::Poly1305;
 
     #[test]
     fn test_sha256() {
diff --git a/src/resolvers/ring.rs b/src/resolvers/ring.rs
index 675aec95..1dde8f0c 100644
--- a/src/resolvers/ring.rs
+++ b/src/resolvers/ring.rs
@@ -1,12 +1,10 @@
-extern crate ring;
-
 use super::CryptoResolver;
 use byteorder::{ByteOrder, BigEndian, LittleEndian};
-use self::ring::aead;
-use self::ring::digest;
-use constants::TAGLEN;
-use params::{DHChoice, HashChoice, CipherChoice};
-use types::{Random, Dh, Hash, Cipher};
+use ring::aead;
+use ring::digest;
+use crate::constants::TAGLEN;
+use crate::params::{DHChoice, HashChoice, CipherChoice};
+use crate::types::{Random, Dh, Hash, Cipher};
 
 /// A resolver that chooses [ring](https://github.com/briansmith/ring)-backed
 /// primitives when available.