From 909cf65c97ef2ec56090559293f6619dbd1e9f1f Mon Sep 17 00:00:00 2001
From: Kevin J Hoerr <kjhoerr@protonmail.com>
Date: Sat, 21 Dec 2019 15:08:10 -0500
Subject: Adopt Rust 2018 edition with idiomatic changes

---
 Cargo.toml                     |  3 ++-
 src/main.rs                    | 12 +++---------
 src/messages/callback.rs       |  3 ++-
 src/messages/mod.rs            |  1 +
 src/messages/not_understood.rs |  3 ++-
 src/routes/callback.rs         |  4 ++--
 src/routes/format_msg.rs       |  4 ++--
 src/routes/mod.rs              |  2 +-
 src/routes/not_understood.rs   |  4 ++--
 9 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 92d4488..a46cab2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,7 @@
 [package]
+edition = "2018"
 name = "august-offensive"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Kevin J Hoerr <kjhoerr@submelon.tech>"]
 description = "Turn-based strategy game as a web service"
 license = "ISC"
diff --git a/src/main.rs b/src/main.rs
index 7a398e7..10b3cc7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,20 +1,14 @@
-extern crate actix_rt;
-extern crate actix_web;
-extern crate dotenv;
-#[macro_use]
-extern crate log;
-extern crate env_logger;
 #[macro_use]
 extern crate diesel;
-extern crate serde;
 #[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
+extern crate log;
 
 pub mod messages;
 pub mod routes;
+#[macro_use]
 pub mod schema;
 
+use actix_rt;
 use actix_web::{middleware, App, HttpServer};
 use diesel::pg::PgConnection;
 use diesel::prelude::*;
diff --git a/src/messages/callback.rs b/src/messages/callback.rs
index f8c7bb3..ebe5222 100644
--- a/src/messages/callback.rs
+++ b/src/messages/callback.rs
@@ -1,4 +1,5 @@
-use messages::Message;
+use crate::messages::Message;
+use serde_derive::{Deserialize, Serialize};
 use std::collections::HashMap;
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/src/messages/mod.rs b/src/messages/mod.rs
index 37a1cb7..52f2d6f 100644
--- a/src/messages/mod.rs
+++ b/src/messages/mod.rs
@@ -5,6 +5,7 @@ pub mod not_understood;
 
 pub use self::callback::Callback;
 pub use self::not_understood::NotUnderstood;
+use serde_derive::{Deserialize, Serialize};
 
 #[derive(Deserialize, Serialize)]
 pub struct OutgoingMsg<T: Message> {
diff --git a/src/messages/not_understood.rs b/src/messages/not_understood.rs
index 0089b9c..36f779c 100644
--- a/src/messages/not_understood.rs
+++ b/src/messages/not_understood.rs
@@ -1,4 +1,5 @@
-use messages::Message;
+use crate::messages::Message;
+use serde_derive::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct NotUnderstood {
diff --git a/src/routes/callback.rs b/src/routes/callback.rs
index 4a258ae..8c07166 100644
--- a/src/routes/callback.rs
+++ b/src/routes/callback.rs
@@ -1,4 +1,4 @@
-use routes::*;
+use crate::routes::*;
 
 // Sends Callback message with information from HttpRequest.
 pub fn callback(req: HttpRequest, query: Query<HashMap<String, String>>) -> JsonMessage<Callback> {
@@ -17,7 +17,7 @@ pub fn callback(req: HttpRequest, query: Query<HashMap<String, String>>) -> Json
 #[cfg(test)]
 mod tests {
     use super::*;
-    use routes::tests::*;
+    use crate::routes::tests::*;
     use actix_web::http::Method;
 
     #[test]
diff --git a/src/routes/format_msg.rs b/src/routes/format_msg.rs
index d7a6f05..83dbd8f 100644
--- a/src/routes/format_msg.rs
+++ b/src/routes/format_msg.rs
@@ -39,8 +39,8 @@ impl<T: Serialize> Responder for FormatMsg<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use routes::*;
-    use routes::tests::*;
+    use crate::routes::*;
+    use crate::routes::tests::*;
     use serde::ser::{Error, Serializer};
 
     #[test]
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
index 759375d..ac11ad9 100644
--- a/src/routes/mod.rs
+++ b/src/routes/mod.rs
@@ -1,6 +1,6 @@
 use actix_web::{web::{route, scope, Query}, HttpRequest, Result, Scope};
 use actix_web::http::StatusCode;
-use messages::*;
+use crate::messages::*;
 use std::collections::HashMap;
 
 pub mod format_msg;
diff --git a/src/routes/not_understood.rs b/src/routes/not_understood.rs
index 4e30361..7ca5ed2 100644
--- a/src/routes/not_understood.rs
+++ b/src/routes/not_understood.rs
@@ -1,4 +1,4 @@
-use routes::*;
+use crate::routes::*;
 
 // Sends a default response message when requested an undefined resource.
 pub fn not_understood(req: HttpRequest) -> JsonMessage<NotUnderstood> {
@@ -15,7 +15,7 @@ pub fn not_understood(req: HttpRequest) -> JsonMessage<NotUnderstood> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use routes::tests::*;
+    use crate::routes::tests::*;
 
     #[test]
     fn test_not_understood() {
-- 
cgit