From e9e9fe3e460634c9feb41321506e6c55cec9fcda Mon Sep 17 00:00:00 2001 From: Marat Safin Date: Wed, 31 Jul 2019 20:38:51 +0300 Subject: [PATCH] cargo fmt --- actix-http/tests/test_rustls_server.rs | 5 ++++- awc/tests/test_rustls_client.rs | 7 +++++-- examples/uds.rs | 3 +-- test-server/src/lib.rs | 2 +- tests/test_server.rs | 5 ++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/actix-http/tests/test_rustls_server.rs b/actix-http/tests/test_rustls_server.rs index 2725af778..32b33fce8 100644 --- a/actix-http/tests/test_rustls_server.rs +++ b/actix-http/tests/test_rustls_server.rs @@ -12,7 +12,10 @@ use actix_service::{new_service_cfg, NewService}; use bytes::{Bytes, BytesMut}; use futures::future::{self, ok, Future}; use futures::stream::{once, Stream}; -use rustls::{NoClientAuth, ServerConfig as RustlsServerConfig, internal::pemfile::{certs, pkcs8_private_keys}}; +use rustls::{ + internal::pemfile::{certs, pkcs8_private_keys}, + NoClientAuth, ServerConfig as RustlsServerConfig, +}; use std::fs::File; use std::io::{BufReader, Result}; diff --git a/awc/tests/test_rustls_client.rs b/awc/tests/test_rustls_client.rs index f25b80b83..e65e4e874 100644 --- a/awc/tests/test_rustls_client.rs +++ b/awc/tests/test_rustls_client.rs @@ -1,5 +1,8 @@ #![cfg(feature = "rust-tls")] -use rustls::{internal::pemfile::{certs, pkcs8_private_keys}, ClientConfig, NoClientAuth}; +use rustls::{ + internal::pemfile::{certs, pkcs8_private_keys}, + ClientConfig, NoClientAuth, +}; use std::fs::File; use std::io::{BufReader, Result}; @@ -15,7 +18,7 @@ use actix_web::http::Version; use actix_web::{web, App, HttpResponse}; fn ssl_acceptor() -> Result> { - use rustls::{ServerConfig}; + use rustls::ServerConfig; // load ssl keys let mut config = ServerConfig::new(NoClientAuth::new()); let cert_file = &mut BufReader::new(File::open("../tests/cert.pem").unwrap()); diff --git a/examples/uds.rs b/examples/uds.rs index a8a45a401..9dc82903f 100644 --- a/examples/uds.rs +++ b/examples/uds.rs @@ -50,5 +50,4 @@ fn main() -> std::io::Result<()> { } #[cfg(not(feature = "uds"))] -fn main() { -} +fn main() {} diff --git a/test-server/src/lib.rs b/test-server/src/lib.rs index aa66bdf84..aba53980c 100644 --- a/test-server/src/lib.rs +++ b/test-server/src/lib.rs @@ -166,7 +166,7 @@ impl TestServer { rt.block_on(lazy( || Ok::<_, ()>(actix_connect::start_default_resolver()), )) - .unwrap(); + .unwrap(); System::set_current(system); TestServerRuntime { addr, rt, client } } diff --git a/tests/test_server.rs b/tests/test_server.rs index 491aaef43..1623d2ef3 100644 --- a/tests/test_server.rs +++ b/tests/test_server.rs @@ -16,6 +16,7 @@ use flate2::Compression; use futures::stream::once; use rand::{distributions::Alphanumeric, Rng}; +use actix_connect::start_default_resolver; use actix_web::middleware::{BodyEncoding, Compress}; use actix_web::{dev, http, test, web, App, HttpResponse, HttpServer}; @@ -823,9 +824,7 @@ fn test_reading_deflate_encoding_large_random_ssl() { let _ = sys.run(); }); let (srv, _sys) = rx.recv().unwrap(); - test::block_on(futures::lazy( - || Ok::<_, ()>(actix_connect::start_default_resolver()), - )).unwrap(); + test::block_on(futures::lazy(|| Ok::<_, ()>(start_default_resolver()))).unwrap(); let client = test::run_on(|| { let mut builder = SslConnector::builder(SslMethod::tls()).unwrap(); builder.set_verify(SslVerifyMode::NONE);