Skip to content

Commit a65a056

Browse files
authored
chore(rustfmt): optimize import (#39)
1 parent 7cee10c commit a65a056

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+169
-105
lines changed

examples/echo.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#[macro_use]
22
extern crate log;
33

4+
use std::fs;
5+
46
use clap::{App, Arg, SubCommand};
57
use rsocket_rust::prelude::*;
68
use rsocket_rust::transport::Connection;
@@ -10,7 +12,6 @@ use rsocket_rust_transport_tcp::{
1012
TcpClientTransport, TcpServerTransport, UnixClientTransport, UnixServerTransport,
1113
};
1214
use rsocket_rust_transport_websocket::{WebsocketClientTransport, WebsocketServerTransport};
13-
use std::fs;
1415

1516
enum RequestMode {
1617
FNF,

examples/qps.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
#[macro_use]
22
extern crate log;
33

4+
use std::sync::{
5+
atomic::{AtomicU32, Ordering},
6+
Arc,
7+
};
8+
use std::time::SystemTime;
9+
410
use clap::{App, Arg};
511
use rsocket_rust::prelude::*;
612
use rsocket_rust::transport::{Connection, Transport};
713
use rsocket_rust::Result;
814
use rsocket_rust_transport_tcp::{TcpClientTransport, UnixClientTransport};
915
use rsocket_rust_transport_websocket::WebsocketClientTransport;
10-
use std::sync::{
11-
atomic::{AtomicU32, Ordering},
12-
Arc,
13-
};
14-
use std::time::SystemTime;
1516
use tokio::sync::{oneshot, Notify};
1617

1718
async fn connect<A, B>(

justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ test:
99
lint:
1010
@cargo clippy
1111
fmt:
12-
@cargo fmt
12+
@cargo +nightly fmt
1313
echo:
1414
@RUST_LOG=release cargo run --release --example echo -- serve tcp://127.0.0.1:7878
1515
bench:

rsocket-messaging/src/requester.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use super::misc::{self, marshal, unmarshal};
1+
use std::collections::LinkedList;
2+
use std::net::SocketAddr;
3+
use std::sync::Arc;
4+
25
use bytes::{Bytes, BytesMut};
36
use rsocket_rust::extension::{CompositeMetadata, MimeType, RoutingMetadata};
47
use rsocket_rust::prelude::*;
@@ -7,11 +10,10 @@ use rsocket_rust::{error::RSocketError, Result};
710
use rsocket_rust_transport_tcp::TcpClientTransport;
811
use rsocket_rust_transport_websocket::WebsocketClientTransport;
912
use serde::{de::DeserializeOwned, Serialize};
10-
use std::collections::LinkedList;
11-
use std::net::SocketAddr;
12-
use std::sync::Arc;
1313
use url::Url;
1414

15+
use super::misc::{self, marshal, unmarshal};
16+
1517
type FnMetadata = Box<dyn FnMut() -> Result<(MimeType, Vec<u8>)>>;
1618
type FnData = Box<dyn FnMut(&MimeType) -> Result<Vec<u8>>>;
1719
type PreflightResult = Result<(Payload, MimeType, Arc<Box<dyn RSocket>>)>;

rsocket-test/tests/test_clients.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#[macro_use]
22
extern crate log;
33

4+
use std::thread::sleep;
5+
use std::time::Duration;
6+
47
use futures::stream;
58
use rsocket_rust::prelude::*;
69
use rsocket_rust::utils::EchoRSocket;
@@ -9,8 +12,6 @@ use rsocket_rust_transport_tcp::{
912
TcpClientTransport, TcpServerTransport, UnixClientTransport, UnixServerTransport,
1013
};
1114
use rsocket_rust_transport_websocket::{WebsocketClientTransport, WebsocketServerTransport};
12-
use std::thread::sleep;
13-
use std::time::Duration;
1415
use tokio::runtime::Runtime;
1516

1617
fn init() {

rsocket-transport-tcp/src/client/tcp.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
use crate::{connection::TcpConnection, misc::parse_tcp_addr};
1+
use std::net::SocketAddr;
2+
23
use rsocket_rust::async_trait;
34
use rsocket_rust::{error::RSocketError, transport::Transport, Result};
4-
use std::net::SocketAddr;
55
use tokio::net::TcpStream;
66

7+
use crate::{connection::TcpConnection, misc::parse_tcp_addr};
8+
79
#[derive(Debug)]
810
enum Connector {
911
Direct(TcpStream),

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
use crate::connection::TlsConnection;
1+
use std::net::SocketAddr;
2+
23
use rsocket_rust::async_trait;
34
use rsocket_rust::{error::RSocketError, transport::Transport, Result};
4-
use std::net::SocketAddr;
55
use tokio::net::TcpStream;
66
use tokio_native_tls::{TlsConnector, TlsStream};
77

8+
use crate::connection::TlsConnection;
9+
810
#[derive(Debug)]
911
enum Connector {
1012
Direct(TlsStream<TcpStream>),

rsocket-transport-tcp/src/client/uds.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
use crate::connection::UnixConnection;
2-
use crate::misc::parse_uds_addr;
31
use rsocket_rust::async_trait;
42
use rsocket_rust::{error::RSocketError, transport::Transport, Result};
53
use tokio::net::UnixStream;
64

5+
use crate::connection::UnixConnection;
6+
use crate::misc::parse_uds_addr;
7+
78
#[derive(Debug)]
89
enum Connector {
910
Direct(UnixStream),

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
use std::io::{Error, ErrorKind};
2+
13
use bytes::{Buf, BytesMut};
24
use rsocket_rust::frame::Frame;
35
use rsocket_rust::utils::{u24, Writeable};
4-
use std::io::{Error, ErrorKind};
56
use tokio_util::codec::{Decoder, Encoder};
67

78
pub struct LengthBasedFrameCodec;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
use futures::{SinkExt, StreamExt};
2-
use tokio::net::TcpStream;
3-
use tokio_util::codec::Framed;
4-
52
use rsocket_rust::error::RSocketError;
63
use rsocket_rust::transport::{Connection, FrameSink, FrameStream};
4+
use tokio::net::TcpStream;
5+
use tokio_util::codec::Framed;
76

87
use super::codec::LengthBasedFrameCodec;
98

0 commit comments

Comments
 (0)