mirror of
https://github.com/actix/actix-web.git
synced 2025-04-06 01:59:39 +00:00
cargo fmt
This commit is contained in:
parent
3dc594a00b
commit
e9e9fe3e46
5 changed files with 13 additions and 9 deletions
actix-http/tests
awc/tests
examples
test-server/src
tests
|
@ -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};
|
||||
|
|
|
@ -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<T: AsyncRead + AsyncWrite>() -> Result<RustlsAcceptor<T, ()>> {
|
||||
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());
|
||||
|
|
|
@ -50,5 +50,4 @@ fn main() -> std::io::Result<()> {
|
|||
}
|
||||
|
||||
#[cfg(not(feature = "uds"))]
|
||||
fn main() {
|
||||
}
|
||||
fn main() {}
|
||||
|
|
|
@ -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 }
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue