diff --git a/examples/echo.rs b/examples/echo.rs
index 3349b85..41fb400 100644
--- a/examples/echo.rs
+++ b/examples/echo.rs
@@ -1,6 +1,8 @@
 #[macro_use]
 extern crate log;
 
+use std::fs;
+
 use clap::{App, Arg, SubCommand};
 use rsocket_rust::prelude::*;
 use rsocket_rust::transport::Connection;
@@ -10,7 +12,6 @@ use rsocket_rust_transport_tcp::{
     TcpClientTransport, TcpServerTransport, UnixClientTransport, UnixServerTransport,
 };
 use rsocket_rust_transport_websocket::{WebsocketClientTransport, WebsocketServerTransport};
-use std::fs;
 
 enum RequestMode {
     FNF,
diff --git a/examples/qps.rs b/examples/qps.rs
index ead2378..920561b 100644
--- a/examples/qps.rs
+++ b/examples/qps.rs
@@ -1,17 +1,18 @@
 #[macro_use]
 extern crate log;
 
+use std::sync::{
+    atomic::{AtomicU32, Ordering},
+    Arc,
+};
+use std::time::SystemTime;
+
 use clap::{App, Arg};
 use rsocket_rust::prelude::*;
 use rsocket_rust::transport::{Connection, Transport};
 use rsocket_rust::Result;
 use rsocket_rust_transport_tcp::{TcpClientTransport, UnixClientTransport};
 use rsocket_rust_transport_websocket::WebsocketClientTransport;
-use std::sync::{
-    atomic::{AtomicU32, Ordering},
-    Arc,
-};
-use std::time::SystemTime;
 use tokio::sync::{oneshot, Notify};
 
 async fn connect<A, B>(
diff --git a/justfile b/justfile
index 9bfdf60..36b565b 100644
--- a/justfile
+++ b/justfile
@@ -9,7 +9,7 @@ test:
 lint:
     @cargo clippy
 fmt:
-    @cargo fmt
+    @cargo +nightly fmt
 echo:
     @RUST_LOG=release cargo run --release --example echo -- serve tcp://127.0.0.1:7878
 bench:
diff --git a/rsocket-messaging/src/requester.rs b/rsocket-messaging/src/requester.rs
index 65dca41..088141a 100644
--- a/rsocket-messaging/src/requester.rs
+++ b/rsocket-messaging/src/requester.rs
@@ -1,4 +1,7 @@
-use super::misc::{self, marshal, unmarshal};
+use std::collections::LinkedList;
+use std::net::SocketAddr;
+use std::sync::Arc;
+
 use bytes::{Bytes, BytesMut};
 use rsocket_rust::extension::{CompositeMetadata, MimeType, RoutingMetadata};
 use rsocket_rust::prelude::*;
@@ -7,11 +10,10 @@ use rsocket_rust::{error::RSocketError, Result};
 use rsocket_rust_transport_tcp::TcpClientTransport;
 use rsocket_rust_transport_websocket::WebsocketClientTransport;
 use serde::{de::DeserializeOwned, Serialize};
-use std::collections::LinkedList;
-use std::net::SocketAddr;
-use std::sync::Arc;
 use url::Url;
 
+use super::misc::{self, marshal, unmarshal};
+
 type FnMetadata = Box<dyn FnMut() -> Result<(MimeType, Vec<u8>)>>;
 type FnData = Box<dyn FnMut(&MimeType) -> Result<Vec<u8>>>;
 type PreflightResult = Result<(Payload, MimeType, Arc<Box<dyn RSocket>>)>;
diff --git a/rsocket-test/tests/test_clients.rs b/rsocket-test/tests/test_clients.rs
index 50d99c6..1181cbc 100644
--- a/rsocket-test/tests/test_clients.rs
+++ b/rsocket-test/tests/test_clients.rs
@@ -1,6 +1,9 @@
 #[macro_use]
 extern crate log;
 
+use std::thread::sleep;
+use std::time::Duration;
+
 use futures::stream;
 use rsocket_rust::prelude::*;
 use rsocket_rust::utils::EchoRSocket;
@@ -9,8 +12,6 @@ use rsocket_rust_transport_tcp::{
     TcpClientTransport, TcpServerTransport, UnixClientTransport, UnixServerTransport,
 };
 use rsocket_rust_transport_websocket::{WebsocketClientTransport, WebsocketServerTransport};
-use std::thread::sleep;
-use std::time::Duration;
 use tokio::runtime::Runtime;
 
 fn init() {
diff --git a/rsocket-transport-tcp/src/client/tcp.rs b/rsocket-transport-tcp/src/client/tcp.rs
index 9896dbe..72ba80e 100644
--- a/rsocket-transport-tcp/src/client/tcp.rs
+++ b/rsocket-transport-tcp/src/client/tcp.rs
@@ -1,9 +1,11 @@
-use crate::{connection::TcpConnection, misc::parse_tcp_addr};
+use std::net::SocketAddr;
+
 use rsocket_rust::async_trait;
 use rsocket_rust::{error::RSocketError, transport::Transport, Result};
-use std::net::SocketAddr;
 use tokio::net::TcpStream;
 
+use crate::{connection::TcpConnection, misc::parse_tcp_addr};
+
 #[derive(Debug)]
 enum Connector {
     Direct(TcpStream),
diff --git a/rsocket-transport-tcp/src/client/tls.rs b/rsocket-transport-tcp/src/client/tls.rs
index 3bc21a1..943976e 100644
--- a/rsocket-transport-tcp/src/client/tls.rs
+++ b/rsocket-transport-tcp/src/client/tls.rs
@@ -1,10 +1,12 @@
-use crate::connection::TlsConnection;
+use std::net::SocketAddr;
+
 use rsocket_rust::async_trait;
 use rsocket_rust::{error::RSocketError, transport::Transport, Result};
-use std::net::SocketAddr;
 use tokio::net::TcpStream;
 use tokio_native_tls::{TlsConnector, TlsStream};
 
+use crate::connection::TlsConnection;
+
 #[derive(Debug)]
 enum Connector {
     Direct(TlsStream<TcpStream>),
diff --git a/rsocket-transport-tcp/src/client/uds.rs b/rsocket-transport-tcp/src/client/uds.rs
index 1efd9f3..9d033fd 100644
--- a/rsocket-transport-tcp/src/client/uds.rs
+++ b/rsocket-transport-tcp/src/client/uds.rs
@@ -1,9 +1,10 @@
-use crate::connection::UnixConnection;
-use crate::misc::parse_uds_addr;
 use rsocket_rust::async_trait;
 use rsocket_rust::{error::RSocketError, transport::Transport, Result};
 use tokio::net::UnixStream;
 
+use crate::connection::UnixConnection;
+use crate::misc::parse_uds_addr;
+
 #[derive(Debug)]
 enum Connector {
     Direct(UnixStream),
diff --git a/rsocket-transport-tcp/src/connection/codec.rs b/rsocket-transport-tcp/src/connection/codec.rs
index 99abce2..c082d5f 100644
--- a/rsocket-transport-tcp/src/connection/codec.rs
+++ b/rsocket-transport-tcp/src/connection/codec.rs
@@ -1,7 +1,8 @@
+use std::io::{Error, ErrorKind};
+
 use bytes::{Buf, BytesMut};
 use rsocket_rust::frame::Frame;
 use rsocket_rust::utils::{u24, Writeable};
-use std::io::{Error, ErrorKind};
 use tokio_util::codec::{Decoder, Encoder};
 
 pub struct LengthBasedFrameCodec;
diff --git a/rsocket-transport-tcp/src/connection/tcp.rs b/rsocket-transport-tcp/src/connection/tcp.rs
index 6b0b4ce..b5144f9 100644
--- a/rsocket-transport-tcp/src/connection/tcp.rs
+++ b/rsocket-transport-tcp/src/connection/tcp.rs
@@ -1,9 +1,8 @@
 use futures::{SinkExt, StreamExt};
-use tokio::net::TcpStream;
-use tokio_util::codec::Framed;
-
 use rsocket_rust::error::RSocketError;
 use rsocket_rust::transport::{Connection, FrameSink, FrameStream};
+use tokio::net::TcpStream;
+use tokio_util::codec::Framed;
 
 use super::codec::LengthBasedFrameCodec;
 
diff --git a/rsocket-transport-tcp/src/connection/tls.rs b/rsocket-transport-tcp/src/connection/tls.rs
index 5d9f032..47e142d 100644
--- a/rsocket-transport-tcp/src/connection/tls.rs
+++ b/rsocket-transport-tcp/src/connection/tls.rs
@@ -1,4 +1,3 @@
-use super::codec::LengthBasedFrameCodec;
 use futures::{SinkExt, StreamExt};
 use rsocket_rust::error::RSocketError;
 use rsocket_rust::transport::{Connection, FrameSink, FrameStream};
@@ -6,6 +5,8 @@ use tokio::net::TcpStream;
 use tokio_native_tls::TlsStream;
 use tokio_util::codec::Framed;
 
+use super::codec::LengthBasedFrameCodec;
+
 #[derive(Debug)]
 pub struct TlsConnection {
     stream: TlsStream<TcpStream>,
diff --git a/rsocket-transport-tcp/src/connection/uds.rs b/rsocket-transport-tcp/src/connection/uds.rs
index 8b454d3..efc512a 100644
--- a/rsocket-transport-tcp/src/connection/uds.rs
+++ b/rsocket-transport-tcp/src/connection/uds.rs
@@ -1,10 +1,11 @@
-use super::codec::LengthBasedFrameCodec;
 use futures::{SinkExt, StreamExt};
 use rsocket_rust::error::RSocketError;
 use rsocket_rust::transport::{Connection, FrameSink, FrameStream};
 use tokio::net::UnixStream;
 use tokio_util::codec::Framed;
 
+use super::codec::LengthBasedFrameCodec;
+
 #[derive(Debug)]
 pub struct UnixConnection {
     stream: UnixStream,
diff --git a/rsocket-transport-tcp/src/lib.rs b/rsocket-transport-tcp/src/lib.rs
index 50b535e..dcb4f19 100644
--- a/rsocket-transport-tcp/src/lib.rs
+++ b/rsocket-transport-tcp/src/lib.rs
@@ -8,15 +8,14 @@ mod connection;
 mod misc;
 mod server;
 
-pub use client::{TcpClientTransport, UnixClientTransport};
-pub use connection::{TcpConnection, UnixConnection};
-pub use server::{TcpServerTransport, UnixServerTransport};
-
 #[cfg(feature = "tls")]
 pub use client::TlsClientTransport;
+pub use client::{TcpClientTransport, UnixClientTransport};
 #[cfg(feature = "tls")]
 pub use connection::TlsConnection;
+pub use connection::{TcpConnection, UnixConnection};
 #[cfg(feature = "tls")]
 pub use server::TlsServerTransport;
+pub use server::{TcpServerTransport, UnixServerTransport};
 #[cfg(feature = "tls")]
 pub use tokio_native_tls;
diff --git a/rsocket-transport-tcp/src/server/tcp.rs b/rsocket-transport-tcp/src/server/tcp.rs
index 0ab415e..085307c 100644
--- a/rsocket-transport-tcp/src/server/tcp.rs
+++ b/rsocket-transport-tcp/src/server/tcp.rs
@@ -1,9 +1,11 @@
-use crate::{client::TcpClientTransport, misc::parse_tcp_addr};
+use std::net::SocketAddr;
+
 use rsocket_rust::async_trait;
 use rsocket_rust::{error::RSocketError, transport::ServerTransport, Result};
-use std::net::SocketAddr;
 use tokio::net::TcpListener;
 
+use crate::{client::TcpClientTransport, misc::parse_tcp_addr};
+
 #[derive(Debug)]
 pub struct TcpServerTransport {
     addr: SocketAddr,
diff --git a/rsocket-transport-tcp/src/server/tls.rs b/rsocket-transport-tcp/src/server/tls.rs
index b92f3b8..b299fcf 100644
--- a/rsocket-transport-tcp/src/server/tls.rs
+++ b/rsocket-transport-tcp/src/server/tls.rs
@@ -1,10 +1,12 @@
-use crate::client::TlsClientTransport;
+use std::net::SocketAddr;
+
 use rsocket_rust::async_trait;
 use rsocket_rust::{error::RSocketError, transport::ServerTransport, Result};
-use std::net::SocketAddr;
 use tokio::net::TcpListener;
 use tokio_native_tls::TlsAcceptor;
 
+use crate::client::TlsClientTransport;
+
 pub struct TlsServerTransport {
     addr: SocketAddr,
     listener: Option<TcpListener>,
diff --git a/rsocket-transport-tcp/src/server/uds.rs b/rsocket-transport-tcp/src/server/uds.rs
index 24618e2..991e04f 100644
--- a/rsocket-transport-tcp/src/server/uds.rs
+++ b/rsocket-transport-tcp/src/server/uds.rs
@@ -1,9 +1,10 @@
-use crate::client::UnixClientTransport;
-use crate::misc::parse_uds_addr;
 use rsocket_rust::async_trait;
 use rsocket_rust::{error::RSocketError, transport::ServerTransport, Result};
 use tokio::net::UnixListener;
 
+use crate::client::UnixClientTransport;
+use crate::misc::parse_uds_addr;
+
 #[derive(Debug)]
 pub struct UnixServerTransport {
     addr: String,
diff --git a/rsocket-transport-wasm/src/client.rs b/rsocket-transport-wasm/src/client.rs
index 62431d9..89a00df 100644
--- a/rsocket-transport-wasm/src/client.rs
+++ b/rsocket-transport-wasm/src/client.rs
@@ -1,4 +1,7 @@
-use super::connection::WebsocketConnection;
+use std::cell::RefCell;
+use std::future::Future;
+use std::rc::Rc;
+
 use async_trait::async_trait;
 use bytes::BytesMut;
 use futures_channel::{mpsc, oneshot};
@@ -8,13 +11,12 @@ use rsocket_rust::frame::Frame;
 use rsocket_rust::transport::Transport;
 use rsocket_rust::utils::Writeable;
 use rsocket_rust::{error::RSocketError, Result};
-use std::cell::RefCell;
-use std::future::Future;
-use std::rc::Rc;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsCast;
 use web_sys::{ErrorEvent, Event, FileReader, MessageEvent, ProgressEvent, WebSocket};
 
+use super::connection::WebsocketConnection;
+
 pub struct WebsocketClientTransport {
     url: String,
 }
diff --git a/rsocket-transport-wasm/src/misc.rs b/rsocket-transport-wasm/src/misc.rs
index 48b6a73..c0b08ad 100644
--- a/rsocket-transport-wasm/src/misc.rs
+++ b/rsocket-transport-wasm/src/misc.rs
@@ -1,10 +1,11 @@
-use super::client::WebsocketClientTransport;
 use js_sys::{Promise, Uint8Array};
 use rsocket_rust::prelude::*;
 use rsocket_rust::Client;
 use wasm_bindgen::prelude::{wasm_bindgen, JsValue};
 use wasm_bindgen_futures::future_to_promise;
 
+use super::client::WebsocketClientTransport;
+
 #[derive(Serialize, Deserialize)]
 pub struct JsPayload {
     data: Option<Vec<u8>>,
diff --git a/rsocket-transport-websocket/src/client.rs b/rsocket-transport-websocket/src/client.rs
index 377d61a..512338b 100644
--- a/rsocket-transport-websocket/src/client.rs
+++ b/rsocket-transport-websocket/src/client.rs
@@ -1,10 +1,12 @@
-use super::connection::WebsocketConnection;
-use rsocket_rust::{async_trait, error::RSocketError, transport::Transport, Result};
 use std::net::SocketAddr;
+
+use rsocket_rust::{async_trait, error::RSocketError, transport::Transport, Result};
 use tokio::net::TcpStream;
 use tokio_tungstenite::{accept_async, connect_async};
 use url::Url;
 
+use super::connection::WebsocketConnection;
+
 #[derive(Debug)]
 pub(crate) enum Connector {
     Direct(TcpStream),
diff --git a/rsocket-transport-websocket/src/connection.rs b/rsocket-transport-websocket/src/connection.rs
index eff31d2..ea66d62 100644
--- a/rsocket-transport-websocket/src/connection.rs
+++ b/rsocket-transport-websocket/src/connection.rs
@@ -1,3 +1,5 @@
+use std::result::Result;
+
 use bytes::{BufMut, BytesMut};
 use futures::stream::SplitSink;
 use futures::{Sink, SinkExt, StreamExt};
@@ -7,7 +9,6 @@ use rsocket_rust::{
     transport::{Connection, FrameSink, FrameStream},
     utils::Writeable,
 };
-use std::result::Result;
 use tokio::net::TcpStream;
 use tokio_tungstenite::{
     tungstenite::{Error as WsError, Message},
diff --git a/rsocket-transport-websocket/src/server.rs b/rsocket-transport-websocket/src/server.rs
index c77a995..e562534 100644
--- a/rsocket-transport-websocket/src/server.rs
+++ b/rsocket-transport-websocket/src/server.rs
@@ -1,8 +1,10 @@
-use super::client::WebsocketClientTransport;
-use rsocket_rust::{async_trait, error::RSocketError, transport::ServerTransport, Result};
 use std::net::SocketAddr;
+
+use rsocket_rust::{async_trait, error::RSocketError, transport::ServerTransport, Result};
 use tokio::net::TcpListener;
 
+use super::client::WebsocketClientTransport;
+
 const WS_PROTO: &str = "ws://";
 
 #[derive(Debug)]
diff --git a/rsocket/src/core/server.rs b/rsocket/src/core/server.rs
index c81642e..deb4dfb 100644
--- a/rsocket/src/core/server.rs
+++ b/rsocket/src/core/server.rs
@@ -1,3 +1,13 @@
+use std::error::Error;
+use std::future::Future;
+use std::marker::PhantomData;
+use std::net::SocketAddr;
+use std::pin::Pin;
+use std::sync::Arc;
+
+use futures::{SinkExt, StreamExt};
+use tokio::sync::mpsc;
+
 use crate::error::RSocketError;
 use crate::frame::{self, Frame};
 use crate::payload::SetupPayload;
@@ -6,14 +16,6 @@ use crate::spi::{RSocket, ServerResponder};
 use crate::transport::{Connection, DuplexSocket, ServerTransport, Splitter, Transport, MIN_MTU};
 use crate::utils::EmptyRSocket;
 use crate::Result;
-use futures::{SinkExt, StreamExt};
-use std::error::Error;
-use std::future::Future;
-use std::marker::PhantomData;
-use std::net::SocketAddr;
-use std::pin::Pin;
-use std::sync::Arc;
-use tokio::sync::mpsc;
 
 pub struct ServerBuilder<T, C> {
     transport: Option<T>,
diff --git a/rsocket/src/error.rs b/rsocket/src/error.rs
index 3aaf645..fbbe75d 100644
--- a/rsocket/src/error.rs
+++ b/rsocket/src/error.rs
@@ -1,5 +1,6 @@
 use std::fmt;
 use std::io;
+
 use thiserror::Error;
 
 pub const ERR_INVALID_SETUP: u32 = 0x0000_0001;
diff --git a/rsocket/src/extension/composite.rs b/rsocket/src/extension/composite.rs
index b9df67c..239b7af 100644
--- a/rsocket/src/extension/composite.rs
+++ b/rsocket/src/extension/composite.rs
@@ -1,11 +1,13 @@
-use super::mime::MimeType;
-use crate::error::RSocketError;
-use crate::utils::{u24, Writeable};
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 use std::collections::LinkedList;
 use std::convert::TryFrom;
 use std::result::Result;
 
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
+use super::mime::MimeType;
+use crate::error::RSocketError;
+use crate::utils::{u24, Writeable};
+
 const MAX_MIME_LEN: usize = 0x7F + 1;
 
 #[derive(Debug, Clone, Eq, PartialEq, Default)]
diff --git a/rsocket/src/extension/routing.rs b/rsocket/src/extension/routing.rs
index d273f22..1ba79db 100644
--- a/rsocket/src/extension/routing.rs
+++ b/rsocket/src/extension/routing.rs
@@ -1,6 +1,7 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 const MAX_ROUTING_TAG_LEN: usize = 0xFF;
 
diff --git a/rsocket/src/frame/error.rs b/rsocket/src/frame/error.rs
index ffbf2b1..e9a3c68 100644
--- a/rsocket/src/frame/error.rs
+++ b/rsocket/src/frame/error.rs
@@ -1,8 +1,10 @@
+use std::fmt;
+
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{Body, Frame};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
-use std::fmt;
 
 #[derive(Debug, PartialEq)]
 pub struct Error {
diff --git a/rsocket/src/frame/keepalive.rs b/rsocket/src/frame/keepalive.rs
index 6e0d836..82b0e77 100644
--- a/rsocket/src/frame/keepalive.rs
+++ b/rsocket/src/frame/keepalive.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{Body, Frame};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct Keepalive {
diff --git a/rsocket/src/frame/lease.rs b/rsocket/src/frame/lease.rs
index 3b305a2..a75abb4 100644
--- a/rsocket/src/frame/lease.rs
+++ b/rsocket/src/frame/lease.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{Body, Frame};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct Lease {
diff --git a/rsocket/src/frame/metadata_push.rs b/rsocket/src/frame/metadata_push.rs
index edd1605..6cda0f5 100644
--- a/rsocket/src/frame/metadata_push.rs
+++ b/rsocket/src/frame/metadata_push.rs
@@ -1,6 +1,7 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{Body, Frame};
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct MetadataPush {
diff --git a/rsocket/src/frame/mod.rs b/rsocket/src/frame/mod.rs
index 9ff368d..c61752f 100644
--- a/rsocket/src/frame/mod.rs
+++ b/rsocket/src/frame/mod.rs
@@ -1,6 +1,7 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 mod cancel;
 mod error;
diff --git a/rsocket/src/frame/payload.rs b/rsocket/src/frame/payload.rs
index c8deff7..3a06720 100644
--- a/rsocket/src/frame/payload.rs
+++ b/rsocket/src/frame/payload.rs
@@ -1,8 +1,9 @@
+use bytes::{BufMut, Bytes, BytesMut};
+
 use super::utils;
 use super::{Body, Frame};
 use crate::utils::Writeable;
 use crate::Result;
-use bytes::{BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct Payload {
diff --git a/rsocket/src/frame/request_channel.rs b/rsocket/src/frame/request_channel.rs
index f7ba6e8..9555dcf 100644
--- a/rsocket/src/frame/request_channel.rs
+++ b/rsocket/src/frame/request_channel.rs
@@ -1,8 +1,9 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::utils;
 use super::{Body, Frame, REQUEST_MAX};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct RequestChannel {
diff --git a/rsocket/src/frame/request_fnf.rs b/rsocket/src/frame/request_fnf.rs
index 80411a3..ed34e68 100644
--- a/rsocket/src/frame/request_fnf.rs
+++ b/rsocket/src/frame/request_fnf.rs
@@ -1,6 +1,7 @@
+use bytes::{BufMut, Bytes, BytesMut};
+
 use super::{utils, Body, Frame};
 use crate::utils::Writeable;
-use bytes::{BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct RequestFNF {
diff --git a/rsocket/src/frame/request_n.rs b/rsocket/src/frame/request_n.rs
index 1f6be4a..4d557e2 100644
--- a/rsocket/src/frame/request_n.rs
+++ b/rsocket/src/frame/request_n.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{utils, Body, Frame, REQUEST_MAX};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct RequestN {
diff --git a/rsocket/src/frame/request_response.rs b/rsocket/src/frame/request_response.rs
index f2a21de..5f120cf 100644
--- a/rsocket/src/frame/request_response.rs
+++ b/rsocket/src/frame/request_response.rs
@@ -1,6 +1,7 @@
+use bytes::{BufMut, Bytes, BytesMut};
+
 use super::{utils, Body, Frame};
 use crate::utils::Writeable;
-use bytes::{BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct RequestResponse {
diff --git a/rsocket/src/frame/request_stream.rs b/rsocket/src/frame/request_stream.rs
index 8ff9326..254b86c 100644
--- a/rsocket/src/frame/request_stream.rs
+++ b/rsocket/src/frame/request_stream.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{utils, Body, Frame, REQUEST_MAX};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct RequestStream {
diff --git a/rsocket/src/frame/resume.rs b/rsocket/src/frame/resume.rs
index 4fea1bc..934c086 100644
--- a/rsocket/src/frame/resume.rs
+++ b/rsocket/src/frame/resume.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{Body, Frame, Version};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct Resume {
diff --git a/rsocket/src/frame/resume_ok.rs b/rsocket/src/frame/resume_ok.rs
index b541ff1..0e53fec 100644
--- a/rsocket/src/frame/resume_ok.rs
+++ b/rsocket/src/frame/resume_ok.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::{Body, Frame};
 use crate::error::RSocketError;
 use crate::utils::Writeable;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[derive(Debug, PartialEq)]
 pub struct ResumeOK {
diff --git a/rsocket/src/frame/setup.rs b/rsocket/src/frame/setup.rs
index 7c99531..c4f880a 100644
--- a/rsocket/src/frame/setup.rs
+++ b/rsocket/src/frame/setup.rs
@@ -1,9 +1,11 @@
+use std::time::Duration;
+
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::utils;
 use super::{Body, Frame, Version};
 use crate::error::RSocketError;
 use crate::utils::{Writeable, DEFAULT_MIME_TYPE};
-use bytes::{Buf, BufMut, Bytes, BytesMut};
-use std::time::Duration;
 
 #[derive(Debug, PartialEq)]
 pub struct Setup {
diff --git a/rsocket/src/frame/utils.rs b/rsocket/src/frame/utils.rs
index badac2f..c12e906 100644
--- a/rsocket/src/frame/utils.rs
+++ b/rsocket/src/frame/utils.rs
@@ -1,7 +1,8 @@
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use super::Frame;
 use crate::error::RSocketError;
 use crate::utils::{u24, Writeable};
-use bytes::{Buf, BufMut, Bytes, BytesMut};
 
 #[inline]
 pub(crate) fn read_payload(
diff --git a/rsocket/src/frame/version.rs b/rsocket/src/frame/version.rs
index cf2c042..8f090a5 100644
--- a/rsocket/src/frame/version.rs
+++ b/rsocket/src/frame/version.rs
@@ -1,6 +1,7 @@
-use crate::utils::Writeable;
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 
+use crate::utils::Writeable;
+
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub struct Version {
     major: u16,
diff --git a/rsocket/src/payload/normal.rs b/rsocket/src/payload/normal.rs
index f0c3e03..fbd2066 100644
--- a/rsocket/src/payload/normal.rs
+++ b/rsocket/src/payload/normal.rs
@@ -1,6 +1,7 @@
+use bytes::Bytes;
+
 use super::misc::bytes_to_utf8;
 use crate::frame;
-use bytes::Bytes;
 
 #[derive(Debug, Clone)]
 pub struct Payload {
diff --git a/rsocket/src/payload/setup.rs b/rsocket/src/payload/setup.rs
index 7ce4057..8d25d92 100644
--- a/rsocket/src/payload/setup.rs
+++ b/rsocket/src/payload/setup.rs
@@ -1,8 +1,10 @@
+use std::time::Duration;
+
+use bytes::Bytes;
+
 use super::misc::bytes_to_utf8;
 use crate::frame::Setup;
 use crate::utils::DEFAULT_MIME_TYPE;
-use bytes::Bytes;
-use std::time::Duration;
 
 #[derive(Debug)]
 pub struct SetupPayload {
diff --git a/rsocket/src/prelude.rs b/rsocket/src/prelude.rs
index 03cb1b8..892de4f 100644
--- a/rsocket/src/prelude.rs
+++ b/rsocket/src/prelude.rs
@@ -1,5 +1,6 @@
+pub use futures::{Sink, SinkExt, Stream, StreamExt};
+
 pub use crate::core::RSocketFactory;
 pub use crate::payload::{Payload, PayloadBuilder, SetupPayload, SetupPayloadBuilder};
 pub use crate::spi::*;
 pub use crate::transport::{ServerTransport, Transport};
-pub use futures::{Sink, SinkExt, Stream, StreamExt};
diff --git a/rsocket/src/spi.rs b/rsocket/src/spi.rs
index b3b0e6f..070b873 100644
--- a/rsocket/src/spi.rs
+++ b/rsocket/src/spi.rs
@@ -1,10 +1,12 @@
-use crate::payload::{Payload, SetupPayload};
-use crate::Result;
-use async_trait::async_trait;
-use futures::Stream;
 use std::future::Future;
 use std::pin::Pin;
 
+use async_trait::async_trait;
+use futures::Stream;
+
+use crate::payload::{Payload, SetupPayload};
+use crate::Result;
+
 pub type ClientResponder = Box<dyn Send + Sync + Fn() -> Box<dyn RSocket>>;
 pub type ServerResponder =
     Box<dyn Send + Sync + Fn(SetupPayload, Box<dyn RSocket>) -> Result<Box<dyn RSocket>>>;
diff --git a/rsocket/src/transport/fragmentation.rs b/rsocket/src/transport/fragmentation.rs
index 3388549..bf6612c 100644
--- a/rsocket/src/transport/fragmentation.rs
+++ b/rsocket/src/transport/fragmentation.rs
@@ -1,7 +1,9 @@
+use std::collections::LinkedList;
+
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+
 use crate::frame::{self, Body, Frame};
 use crate::payload::Payload;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
-use std::collections::LinkedList;
 
 pub(crate) const MIN_MTU: usize = 64;
 
@@ -136,10 +138,11 @@ impl Joiner {
 #[cfg(test)]
 mod tests {
 
+    use bytes::{Buf, Bytes};
+
     use crate::frame::{self, Frame};
     use crate::payload::Payload;
     use crate::transport::{Joiner, Splitter};
-    use bytes::{Buf, Bytes};
 
     #[test]
     fn test_joiner() {
diff --git a/rsocket/src/transport/misc.rs b/rsocket/src/transport/misc.rs
index 7b67b66..f99806c 100644
--- a/rsocket/src/transport/misc.rs
+++ b/rsocket/src/transport/misc.rs
@@ -1,7 +1,8 @@
-use crate::frame::Frame;
 use std::sync::atomic::{AtomicI64, AtomicU32, Ordering};
 use std::sync::Arc;
 
+use crate::frame::Frame;
+
 #[derive(Debug, Clone)]
 pub(crate) struct StreamID {
     inner: Arc<AtomicU32>,
diff --git a/rsocket/src/transport/socket.rs b/rsocket/src/transport/socket.rs
index 6f1d99b..4cbb302 100644
--- a/rsocket/src/transport/socket.rs
+++ b/rsocket/src/transport/socket.rs
@@ -1,3 +1,14 @@
+use std::future::Future;
+use std::pin::Pin;
+use std::sync::Arc;
+
+use async_stream::stream;
+use async_trait::async_trait;
+use bytes::{Buf, BufMut, Bytes, BytesMut};
+use dashmap::{mapref::entry::Entry, DashMap};
+use futures::{Sink, SinkExt, Stream, StreamExt};
+use tokio::sync::{mpsc, oneshot, RwLock};
+
 use super::fragmentation::{Joiner, Splitter};
 use super::misc::{debug_frame, Counter, StreamID};
 use super::spi::*;
@@ -7,15 +18,6 @@ use crate::payload::{Payload, SetupPayload};
 use crate::spi::{Flux, RSocket, ServerResponder};
 use crate::utils::EmptyRSocket;
 use crate::{runtime, Result};
-use async_stream::stream;
-use async_trait::async_trait;
-use bytes::{Buf, BufMut, Bytes, BytesMut};
-use dashmap::{mapref::entry::Entry, DashMap};
-use futures::{Sink, SinkExt, Stream, StreamExt};
-use std::future::Future;
-use std::pin::Pin;
-use std::sync::Arc;
-use tokio::sync::{mpsc, oneshot, RwLock};
 
 #[derive(Clone)]
 pub(crate) struct DuplexSocket {
diff --git a/rsocket/src/utils.rs b/rsocket/src/utils.rs
index b5d4b64..4b6d2c8 100644
--- a/rsocket/src/utils.rs
+++ b/rsocket/src/utils.rs
@@ -1,17 +1,19 @@
-use super::spi::{Flux, RSocket};
-use crate::error::RSocketError;
-use crate::payload::Payload;
-use crate::runtime;
-use crate::Result;
+use std::error::Error;
+use std::future::Future;
+use std::pin::Pin;
+
 use async_stream::stream;
 use async_trait::async_trait;
 use bytes::{Buf, BufMut, Bytes, BytesMut};
 use futures::{pin_mut, FutureExt, Sink, SinkExt, Stream, StreamExt};
-use std::error::Error;
-use std::future::Future;
-use std::pin::Pin;
 use tokio::sync::mpsc;
 
+use super::spi::{Flux, RSocket};
+use crate::error::RSocketError;
+use crate::payload::Payload;
+use crate::runtime;
+use crate::Result;
+
 pub const DEFAULT_MIME_TYPE: &str = "application/binary";
 
 pub struct EchoRSocket;
diff --git a/rustfmt.toml b/rustfmt.toml
index 32a9786..a75a838 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1 +1,3 @@
 edition = "2018"
+group_imports="StdExternalCrate"
+