1 files changed, 11 insertions, 14 deletions
diff --git a/src/main.rs b/src/main.rs
index 1bf3e98..ab5db5d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,13 +2,8 @@
 #![feature(pattern)]
 #![feature(concat_idents)]
 #![feature(associated_type_defaults)]
-
-#![feature(box_syntax, box_patterns)]
-
-// trash dependencies that can't be fucked to upgrade to ed. 2018
-#[macro_use] extern crate diesel;
-#[macro_use] extern crate pest_derive;
-#[macro_use] extern crate envconfig_derive;
+#![feature(box_patterns)]
+#![allow(deprecated)]
 
 use std::{
     thread,
@@ -23,8 +18,10 @@ use log::{
     info,
 };
 
-pub use self::util::*;
-pub use self::config::*;
+pub use self::{
+    config::*,
+    util::*,
+};
 
 #[cfg(feature = "diesel")]
 mod db;
@@ -38,16 +35,16 @@ mod game {
 
     #[inline]
     fn register(f: StandardFramework) -> StandardFramework {
-        return f
+        return f;
     }
 }
 
-mod commands;
-mod util;
 mod audio;
+mod bot;
+mod commands;
 mod config;
 mod log_setup;
-mod bot;
+mod util;
 
 pub type Error = anyhow::Error;
 pub type Result<T> = anyhow::Result<T>;
@@ -74,7 +71,7 @@ fn main() {
             _ => {
                 // NOTE: we MUST have gotten here through SIGINT/SIGTERM handlers
                 ::std::process::exit(0);
-            }
+            },
         }
 
         if Instant::now() - start >= MIN_RUN_DURATION {