diff --git a/.rustfmt.toml b/.rustfmt.toml
index ca1e776b..5b43d57c 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,2 +1,5 @@
 use_small_heuristics = "Max"
 group_imports = "StdExternalCrate"
+edition = "2018"
+unstable_features = true
+version = "Two"
diff --git a/sqlx-core/src/io.rs b/sqlx-core/src/io.rs
index 2b63f59c..469b67d9 100644
--- a/sqlx-core/src/io.rs
+++ b/sqlx-core/src/io.rs
@@ -1,11 +1,11 @@
 mod buf;
-mod write;
 mod buf_stream;
 mod deserialize;
 mod serialize;
+mod write;
 
 pub use buf::BufExt;
-pub use write::WriteExt;
 pub use buf_stream::BufStream;
 pub use deserialize::Deserialize;
 pub use serialize::Serialize;
+pub use write::WriteExt;
diff --git a/sqlx-core/src/io/buf.rs b/sqlx-core/src/io/buf.rs
index 269395af..3910a1b8 100644
--- a/sqlx-core/src/io/buf.rs
+++ b/sqlx-core/src/io/buf.rs
@@ -1,6 +1,6 @@
 use std::io;
 
-use bytes::{Bytes, Buf};
+use bytes::{Buf, Bytes};
 use memchr::memchr;
 use string::String;
 
@@ -33,7 +33,9 @@ impl BufExt for Bytes {
 #[cfg(test)]
 mod tests {
     use std::io;
-    use bytes::{Bytes, Buf};
+
+    use bytes::{Buf, Bytes};
+
     use super::BufExt;
 
     #[test]
diff --git a/sqlx-mysql/src/io.rs b/sqlx-mysql/src/io.rs
index b32a8d0f..18b8a546 100644
--- a/sqlx-mysql/src/io.rs
+++ b/sqlx-mysql/src/io.rs
@@ -1,5 +1,5 @@
-mod write;
 mod buf;
+mod write;
 
-pub(crate) use write::MySqlWriteExt;
 pub(crate) use buf::MySqlBufExt;
+pub(crate) use write::MySqlWriteExt;
diff --git a/sqlx-mysql/src/io/buf.rs b/sqlx-mysql/src/io/buf.rs
index 57f5a7e6..b82df612 100644
--- a/sqlx-mysql/src/io/buf.rs
+++ b/sqlx-mysql/src/io/buf.rs
@@ -1,6 +1,6 @@
-use bytes::{Bytes, Buf};
-use string::String;
+use bytes::{Buf, Bytes};
 use sqlx_core::io::BufExt;
+use string::String;
 
 // UNSAFE: _unchecked string methods
 // intended for use when the protocol is *known* to always produce
@@ -30,7 +30,7 @@ impl MySqlBufExt for Bytes {
             // NOTE: 0xFF may be the first byte of an ERR packet
             0xff => unreachable!("unexpected 0xFF (undefined) in `get_uint_lenenc`"),
 
-            value => u64::from(value)
+            value => u64::from(value),
         }
     }
 
diff --git a/sqlx-mysql/src/protocol/handshake_response.rs b/sqlx-mysql/src/protocol/handshake_response.rs
index dce3b0ee..3e11c8f6 100644
--- a/sqlx-mysql/src/protocol/handshake_response.rs
+++ b/sqlx-mysql/src/protocol/handshake_response.rs
@@ -2,8 +2,8 @@ use bytes::BufMut;
 use sqlx_core::io::{Serialize, WriteExt};
 use sqlx_core::Result;
 
-use crate::protocol::Capabilities;
 use crate::io::MySqlWriteExt;
+use crate::protocol::Capabilities;
 
 // https://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse
 // https://mariadb.com/kb/en/connection/#client-handshake-response