diff --git a/rustfmt.toml b/rustfmt.toml
index 7d2cf54..e86028b 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1 +1 @@
-merge_imports = true
+imports_granularity="Crate"
diff --git a/src/database.rs b/src/database.rs
index 34b74be..bf3e0f0 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -17,9 +17,11 @@ use log::info;
 use rocket::futures::{self, channel::mpsc};
 use ruma::{DeviceId, ServerName, UserId};
 use serde::Deserialize;
-use std::collections::HashMap;
-use std::fs::remove_dir_all;
-use std::sync::{Arc, RwLock};
+use std::{
+    collections::HashMap,
+    fs::remove_dir_all,
+    sync::{Arc, RwLock},
+};
 use tokio::sync::Semaphore;
 
 #[derive(Clone, Debug, Deserialize)]
diff --git a/src/database/appservice.rs b/src/database/appservice.rs
index 26ea5b9..764291d 100644
--- a/src/database/appservice.rs
+++ b/src/database/appservice.rs
@@ -1,6 +1,8 @@
 use crate::{utils, Error, Result};
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+use std::{
+    collections::HashMap,
+    sync::{Arc, RwLock},
+};
 
 #[derive(Clone)]
 pub struct Appservice {
diff --git a/src/database/globals.rs b/src/database/globals.rs
index 8d7f104..8c0463d 100644
--- a/src/database/globals.rs
+++ b/src/database/globals.rs
@@ -4,10 +4,11 @@ use ruma::{
     api::federation::discovery::{ServerSigningKeys, VerifyKey},
     ServerName, ServerSigningKeyId,
 };
-use std::collections::{BTreeMap, HashMap};
-use std::sync::Arc;
-use std::sync::RwLock;
-use std::time::Duration;
+use std::{
+    collections::{BTreeMap, HashMap},
+    sync::{Arc, RwLock},
+    time::Duration,
+};
 use trust_dns_resolver::TokioAsyncResolver;
 
 pub const COUNTER: &str = "c";
diff --git a/src/database/sending.rs b/src/database/sending.rs
index 9793971..00073af 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -16,8 +16,7 @@ use ruma::{
     ServerName,
 };
 use sled::IVec;
-use tokio::select;
-use tokio::sync::Semaphore;
+use tokio::{select, sync::Semaphore};
 
 #[derive(Clone)]
 pub struct Sending {
diff --git a/src/error.rs b/src/error.rs
index 13efce6..d8f10f4 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -1,4 +1,8 @@
-use std::{collections::HashMap, sync::RwLock, time::Duration, time::Instant};
+use std::{
+    collections::HashMap,
+    sync::RwLock,
+    time::{Duration, Instant},
+};
 
 use log::error;
 use ruma::{
diff --git a/src/main.rs b/src/main.rs
index b469f4d..a2c020f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,4 @@
-// #![warn(rust_2018_idioms)]
+#![warn(rust_2018_idioms)]
 
 pub mod appservice_server;
 pub mod client_server;
@@ -19,11 +19,15 @@ pub use rocket::State;
 use ruma::api::client::error::ErrorKind;
 pub use ruma_wrapper::{ConduitResult, Ruma, RumaResponse};
 
-use rocket::figment::{
-    providers::{Env, Format, Toml},
-    Figment,
+use rocket::{
+    catch, catchers,
+    fairing::AdHoc,
+    figment::{
+        providers::{Env, Format, Toml},
+        Figment,
+    },
+    routes, Request,
 };
-use rocket::{catch, catchers, fairing::AdHoc, routes, Request};
 use tracing::span;
 use tracing_subscriber::{prelude::*, Registry};