chore(rustfmt): optimize import

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,

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>(

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:

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>>)>;

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() {

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),

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>),

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),

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;

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;
 

rsocket-transport-tcp/src/connection/tls.rs

@@ -1,11 +1,12 @@
-use super::codec::LengthBasedFrameCodec;
 use futures::{SinkExt, StreamExt};
 use rsocket_rust::error::RSocketError;
 use rsocket_rust::transport::{Connection, FrameSink, FrameStream};
 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>,

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,

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;

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,

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>,

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,

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,
 }

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>>,

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),

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},

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)]

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>,

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;

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)]

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;
 

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 {