From 34f0dba6dcdd3c65da04fc277839d4fe129843f4 Mon Sep 17 00:00:00 2001 From: Sean McArthur Date: Thu, 4 Jan 2018 14:50:18 -0800 Subject: [PATCH] chore(log): update to log 0.4 --- Cargo.toml | 4 ++-- examples/client.rs | 2 +- examples/hello.rs | 2 +- examples/multi_server.rs | 2 +- examples/params.rs | 2 +- examples/send_file.rs | 2 +- examples/server.rs | 2 +- examples/web_api.rs | 2 +- src/proto/conn.rs | 2 +- src/proto/h1/parse.rs | 4 ++-- tests/client.rs | 20 ++++++++++---------- tests/server.rs | 8 ++++---- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 62e2bfc6..ac434d91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ futures-cpupool = "0.1.6" http = { version = "0.1", optional = true } httparse = "1.0" language-tags = "0.2" -log = "0.3" +log = "0.4" mime = "0.3.2" percent-encoding = "1.0" relay = "0.1" @@ -39,7 +39,7 @@ unicase = "2.0" [dev-dependencies] num_cpus = "1.0" -pretty_env_logger = "0.1" +pretty_env_logger = "0.2.0-rc.1" spmc = "0.2" url = "1.0" diff --git a/examples/client.rs b/examples/client.rs index e17a86ea..c2a79c02 100644 --- a/examples/client.rs +++ b/examples/client.rs @@ -14,7 +14,7 @@ use futures::stream::Stream; use hyper::Client; fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let url = match env::args().nth(1) { Some(url) => url, diff --git a/examples/hello.rs b/examples/hello.rs index 14b90351..208d05c9 100644 --- a/examples/hello.rs +++ b/examples/hello.rs @@ -9,7 +9,7 @@ use hyper::server::{Http, Response, const_service, service_fn}; static PHRASE: &'static [u8] = b"Hello World!"; fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let addr = ([127, 0, 0, 1], 3000).into(); let new_service = const_service(service_fn(|_| { diff --git a/examples/multi_server.rs b/examples/multi_server.rs index c3de1c2a..39be36b9 100644 --- a/examples/multi_server.rs +++ b/examples/multi_server.rs @@ -41,7 +41,7 @@ impl Service for Srv { fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let addr1 = "127.0.0.1:1337".parse().unwrap(); let addr2 = "127.0.0.1:1338".parse().unwrap(); diff --git a/examples/params.rs b/examples/params.rs index a21fea61..5eefbc3e 100644 --- a/examples/params.rs +++ b/examples/params.rs @@ -96,7 +96,7 @@ impl Service for ParamExample { fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let addr = "127.0.0.1:1337".parse().unwrap(); let server = Http::new().bind(&addr, || Ok(ParamExample)).unwrap(); diff --git a/examples/send_file.rs b/examples/send_file.rs index 071fde02..68bc1197 100644 --- a/examples/send_file.rs +++ b/examples/send_file.rs @@ -132,7 +132,7 @@ impl Service for ResponseExamples { fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let addr = "127.0.0.1:1337".parse().unwrap(); let server = Http::new().bind(&addr, || Ok(ResponseExamples)).unwrap(); diff --git a/examples/server.rs b/examples/server.rs index 4e164bf9..9b246cf6 100644 --- a/examples/server.rs +++ b/examples/server.rs @@ -44,7 +44,7 @@ impl Service for Echo { fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let addr = "127.0.0.1:1337".parse().unwrap(); let server = Http::new().bind(&addr, || Ok(Echo)).unwrap(); diff --git a/examples/web_api.rs b/examples/web_api.rs index 655ae93e..34184760 100644 --- a/examples/web_api.rs +++ b/examples/web_api.rs @@ -76,7 +76,7 @@ impl Service for ResponseExamples { fn main() { - pretty_env_logger::init().unwrap(); + pretty_env_logger::init(); let addr = "127.0.0.1:1337".parse().unwrap(); let mut core = tokio_core::reactor::Core::new().unwrap(); diff --git a/src/proto/conn.rs b/src/proto/conn.rs index d03fe1e3..3a45659f 100644 --- a/src/proto/conn.rs +++ b/src/proto/conn.rs @@ -1048,7 +1048,7 @@ mod tests { #[test] fn test_conn_body_write_length() { extern crate pretty_env_logger; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let _: Result<(), ()> = future::lazy(|| { let io = AsyncIo::new_buf(vec![], 0); let mut conn = Conn::<_, proto::Chunk, ServerTransaction>::new(io, Default::default()); diff --git a/src/proto/h1/parse.rs b/src/proto/h1/parse.rs index d993d928..027d3496 100644 --- a/src/proto/h1/parse.rs +++ b/src/proto/h1/parse.rs @@ -403,7 +403,7 @@ mod tests { #[test] fn test_parse_request() { extern crate pretty_env_logger; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let mut raw = BytesMut::from(b"GET /echo HTTP/1.1\r\nHost: hyper.rs\r\n\r\n".to_vec()); let expected_len = raw.len(); let (req, len) = ServerTransaction::parse(&mut raw).unwrap().unwrap(); @@ -419,7 +419,7 @@ mod tests { #[test] fn test_parse_response() { extern crate pretty_env_logger; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let mut raw = BytesMut::from(b"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n".to_vec()); let expected_len = raw.len(); let (req, len) = ClientTransaction::parse(&mut raw).unwrap().unwrap(); diff --git a/tests/client.rs b/tests/client.rs index 57994946..958ceb7a 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -49,7 +49,7 @@ macro_rules! test { fn $name() { #![allow(unused)] use hyper::header::*; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let mut core = Core::new().unwrap(); let res = test! { @@ -100,7 +100,7 @@ macro_rules! test { fn $name() { #![allow(unused)] use hyper::header::*; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let mut core = Core::new().unwrap(); let err = test! { @@ -500,7 +500,7 @@ fn client_keep_alive() { /* TODO: re-enable once retry works, its currently a flaky test #[test] fn client_pooled_socket_disconnected() { - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); let mut core = Core::new().unwrap(); @@ -585,7 +585,7 @@ mod dispatch_impl { #[test] fn drop_body_before_eof_closes_connection() { // https://github.com/hyperium/hyper/issues/1353 - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); @@ -626,7 +626,7 @@ mod dispatch_impl { #[test] fn dropped_client_closes_connection() { // https://github.com/hyperium/hyper/issues/1353 - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); @@ -672,7 +672,7 @@ mod dispatch_impl { #[test] fn drop_client_closes_idle_connections() { - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); @@ -721,7 +721,7 @@ mod dispatch_impl { #[test] fn drop_response_future_closes_in_progress_connection() { - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); @@ -766,7 +766,7 @@ mod dispatch_impl { #[test] fn drop_response_body_closes_in_progress_connection() { - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); @@ -811,7 +811,7 @@ mod dispatch_impl { #[test] fn no_keep_alive_closes_connection() { // https://github.com/hyperium/hyper/issues/1383 - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); @@ -850,7 +850,7 @@ mod dispatch_impl { #[test] fn socket_disconnect_closes_idle_conn() { // notably when keep-alive is enabled - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = TcpListener::bind("127.0.0.1:0").unwrap(); let addr = server.local_addr().unwrap(); diff --git a/tests/server.rs b/tests/server.rs index b328b5ac..e55e55e6 100644 --- a/tests/server.rs +++ b/tests/server.rs @@ -260,7 +260,7 @@ fn empty_response_chunked() { #[test] fn empty_response_chunked_without_body_should_set_content_length() { extern crate pretty_env_logger; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = serve(); server.reply() .status(hyper::Ok) @@ -290,7 +290,7 @@ fn empty_response_chunked_without_body_should_set_content_length() { #[test] fn head_response_can_send_content_length() { extern crate pretty_env_logger; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = serve(); server.reply() .status(hyper::Ok) @@ -319,7 +319,7 @@ fn head_response_can_send_content_length() { #[test] fn response_does_not_set_chunked_if_body_not_allowed() { extern crate pretty_env_logger; - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let server = serve(); server.reply() .status(hyper::StatusCode::NotModified) @@ -883,7 +883,7 @@ impl Default for ServeOptions { } fn serve_with_options(options: ServeOptions) -> Serve { - let _ = pretty_env_logger::init(); + let _ = pretty_env_logger::try_init(); let (addr_tx, addr_rx) = mpsc::channel(); let (msg_tx, msg_rx) = mpsc::channel();