From c3ccf51b022c7c8f94b517edd601936b13a86a66 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Sat, 22 Dec 2018 12:08:54 +0100 Subject: [PATCH] Use nested imports --- .rustfmt.toml | 1 + examples/hello_world.rs | 13 ++++++------- src/lib.rs | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) create mode 100644 .rustfmt.toml diff --git a/.rustfmt.toml b/.rustfmt.toml new file mode 100644 index 00000000..7d2cf549 --- /dev/null +++ b/.rustfmt.toml @@ -0,0 +1 @@ +merge_imports = true diff --git a/examples/hello_world.rs b/examples/hello_world.rs index e12ff258..9f55fe67 100644 --- a/examples/hello_world.rs +++ b/examples/hello_world.rs @@ -7,15 +7,14 @@ extern crate ruma_identifiers; extern crate tokio_core; extern crate url; -use std::convert::TryFrom; -use std::env; -use std::process::exit; +use std::{convert::TryFrom, env, process::exit}; use futures::Future; -use ruma_client::api::r0; -use ruma_client::Client; -use ruma_events::room::message::{MessageEventContent, MessageType, TextMessageEventContent}; -use ruma_events::EventType; +use ruma_client::{api::r0, Client}; +use ruma_events::{ + room::message::{MessageEventContent, MessageType, TextMessageEventContent}, + EventType, +}; use ruma_identifiers::RoomAliasId; use tokio_core::reactor::Core; use url::Url; diff --git a/src/lib.rs b/src/lib.rs index 5437d222..760ff6c6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,16 +18,16 @@ extern crate serde_json; extern crate serde_urlencoded; extern crate url; -use std::cell::RefCell; -use std::convert::TryInto; -use std::rc::Rc; -use std::str::FromStr; +use std::{cell::RefCell, convert::TryInto, rc::Rc, str::FromStr}; -use futures::future::{Future, FutureFrom, IntoFuture}; -use futures::stream::{self, Stream}; -use hyper::client::connect::Connect; -use hyper::client::HttpConnector; -use hyper::{Client as HyperClient, Uri}; +use futures::{ + future::{Future, FutureFrom, IntoFuture}, + stream::{self, Stream}, +}; +use hyper::{ + client::{connect::Connect, HttpConnector}, + Client as HyperClient, Uri, +}; #[cfg(feature = "hyper-tls")] use hyper_tls::HttpsConnector; #[cfg(feature = "hyper-tls")]