Rust 2018 edition migration

4 files changed, 13 insertions, 20 deletions

diff --git a/src/config/environment.rs b/src/config/environment.rs
index fa96185..91813ba 100644
--- a/src/config/environment.rs
+++ b/src/config/environment.rs
@@ -12,15 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extern crate hex;
-
 use std::env;
 use std::time::Duration;
 
-use config::ServerConfig;
-use config::{DEFAULT_BATCH_SIZE, DEFAULT_STATUS_INTERVAL};
-use key::KmsProtection;
-use Error;
+use crate::config::ServerConfig;
+use crate::config::{DEFAULT_BATCH_SIZE, DEFAULT_STATUS_INTERVAL};
+use crate::key::KmsProtection;
+use crate::Error;
 
 ///
 /// Obtain a Roughenough server configuration ([ServerConfig](trait.ServerConfig.html))
diff --git a/src/config/file.rs b/src/config/file.rs
index d3ec64a..d6853d2 100644
--- a/src/config/file.rs
+++ b/src/config/file.rs
@@ -12,17 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-extern crate hex;
-
 use std::fs::File;
 use std::io::Read;
 use std::time::Duration;
 use yaml_rust::YamlLoader;
 
-use config::ServerConfig;
-use config::{DEFAULT_BATCH_SIZE, DEFAULT_STATUS_INTERVAL};
-use key::KmsProtection;
-use Error;
+use crate::config::ServerConfig;
+use crate::config::{DEFAULT_BATCH_SIZE, DEFAULT_STATUS_INTERVAL};
+use crate::key::KmsProtection;
+use crate::Error;
 
 ///
 /// Read a Roughenough server configuration ([ServerConfig](trait.ServerConfig.html))
diff --git a/src/config/memory.rs b/src/config/memory.rs
index e3aae7e..75f5180 100644
--- a/src/config/memory.rs
+++ b/src/config/memory.rs
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use config::ServerConfig;
-use config::{DEFAULT_BATCH_SIZE, DEFAULT_STATUS_INTERVAL};
-use key::KmsProtection;
+use crate::config::ServerConfig;
+use crate::config::{DEFAULT_BATCH_SIZE, DEFAULT_STATUS_INTERVAL};
+use crate::key::KmsProtection;
 use std::time::Duration;
 
 use hex;
diff --git a/src/config/mod.rs b/src/config/mod.rs
index b73892f..1a3cd15 100644
--- a/src/config/mod.rs
+++ b/src/config/mod.rs
@@ -22,9 +22,6 @@
 //! such as files or environment variables.
 //!
 
-extern crate hex;
-extern crate log;
-
 use std::net::SocketAddr;
 use std::time::Duration;
 
@@ -37,8 +34,8 @@ pub use self::environment::EnvironmentConfig;
 mod memory;
 pub use self::memory::MemoryConfig;
 
-use key::KmsProtection;
-use Error;
+use crate::key::KmsProtection;
+use crate::Error;
 
 /// Maximum number of requests to process in one batch and include the the Merkle tree.
 pub const DEFAULT_BATCH_SIZE: u8 = 64;