forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(log): update to log 0.4

Browse Source
This commit is contained in:
Sean McArthur
2018-01-04 14:50:18 -08:00
parent 6ade21aa7f
commit 34f0dba6dc
12 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@@ -26,7 +26,7 @@ futures-cpupool = "0.1.6"
http = { version = "0.1", optional = true } http = { version = "0.1", optional = true }
httparse = "1.0" httparse = "1.0"
language-tags = "0.2" language-tags = "0.2"
log = "0.3" log = "0.4"
mime = "0.3.2" mime = "0.3.2"
percent-encoding = "1.0" percent-encoding = "1.0"
relay = "0.1" relay = "0.1"
@@ -39,7 +39,7 @@ unicase = "2.0"
[dev-dependencies] [dev-dependencies]
num_cpus = "1.0" num_cpus = "1.0"
pretty_env_logger = "0.1" pretty_env_logger = "0.2.0-rc.1"
spmc = "0.2" spmc = "0.2"
url = "1.0" url = "1.0"

2
examples/client.rs
View File

@@ -14,7 +14,7 @@ use futures::stream::Stream;
use hyper::Client; use hyper::Client;
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let url = match env::args().nth(1) { let url = match env::args().nth(1) {
Some(url) => url, Some(url) => url,

2
examples/hello.rs
View File

@@ -9,7 +9,7 @@ use hyper::server::{Http, Response, const_service, service_fn};
static PHRASE: &'static [u8] = b"Hello World!"; static PHRASE: &'static [u8] = b"Hello World!";
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let addr = ([127, 0, 0, 1], 3000).into(); let addr = ([127, 0, 0, 1], 3000).into();
let new_service = const_service(service_fn(|_| { let new_service = const_service(service_fn(|_| {

2
examples/multi_server.rs
View File

@@ -41,7 +41,7 @@ impl Service for Srv {
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let addr1 = "127.0.0.1:1337".parse().unwrap(); let addr1 = "127.0.0.1:1337".parse().unwrap();
let addr2 = "127.0.0.1:1338".parse().unwrap(); let addr2 = "127.0.0.1:1338".parse().unwrap();

2
examples/params.rs
View File

@@ -96,7 +96,7 @@ impl Service for ParamExample {
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let addr = "127.0.0.1:1337".parse().unwrap(); let addr = "127.0.0.1:1337".parse().unwrap();
let server = Http::new().bind(&addr, || Ok(ParamExample)).unwrap(); let server = Http::new().bind(&addr, || Ok(ParamExample)).unwrap();

2
examples/send_file.rs
View File

@@ -132,7 +132,7 @@ impl Service for ResponseExamples {
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let addr = "127.0.0.1:1337".parse().unwrap(); let addr = "127.0.0.1:1337".parse().unwrap();
let server = Http::new().bind(&addr, || Ok(ResponseExamples)).unwrap(); let server = Http::new().bind(&addr, || Ok(ResponseExamples)).unwrap();

2
examples/server.rs
View File

@@ -44,7 +44,7 @@ impl Service for Echo {
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let addr = "127.0.0.1:1337".parse().unwrap(); let addr = "127.0.0.1:1337".parse().unwrap();
let server = Http::new().bind(&addr, || Ok(Echo)).unwrap(); let server = Http::new().bind(&addr, || Ok(Echo)).unwrap();

2
examples/web_api.rs
View File

@@ -76,7 +76,7 @@ impl Service for ResponseExamples {
fn main() { fn main() {
pretty_env_logger::init().unwrap(); pretty_env_logger::init();
let addr = "127.0.0.1:1337".parse().unwrap(); let addr = "127.0.0.1:1337".parse().unwrap();
let mut core = tokio_core::reactor::Core::new().unwrap(); let mut core = tokio_core::reactor::Core::new().unwrap();

2
src/proto/conn.rs
View File

@@ -1048,7 +1048,7 @@ mod tests {
#[test] #[test]
fn test_conn_body_write_length() { fn test_conn_body_write_length() {
extern crate pretty_env_logger; extern crate pretty_env_logger;
let _ = pretty_env_logger::init(); let _ = pretty_env_logger::try_init();
let _: Result<(), ()> = future::lazy(|| { let _: Result<(), ()> = future::lazy(|| {
let io = AsyncIo::new_buf(vec![], 0); let io = AsyncIo::new_buf(vec![], 0);
let mut conn = Conn::<_, proto::Chunk, ServerTransaction>::new(io, Default::default()); let mut conn = Conn::<_, proto::Chunk, ServerTransaction>::new(io, Default::default());

4
src/proto/h1/parse.rs
View File

@@ -403,7 +403,7 @@ mod tests {
#[test] #[test]
fn test_parse_request() { fn test_parse_request() {
extern crate pretty_env_logger; 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 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 expected_len = raw.len();
let (req, len) = ServerTransaction::parse(&mut raw).unwrap().unwrap(); let (req, len) = ServerTransaction::parse(&mut raw).unwrap().unwrap();
@@ -419,7 +419,7 @@ mod tests {
#[test] #[test]
fn test_parse_response() { fn test_parse_response() {
extern crate pretty_env_logger; 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 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 expected_len = raw.len();
let (req, len) = ClientTransaction::parse(&mut raw).unwrap().unwrap(); let (req, len) = ClientTransaction::parse(&mut raw).unwrap().unwrap();

20
tests/client.rs
View File

@@ -49,7 +49,7 @@ macro_rules! test {
fn $name() { fn $name() {
#![allow(unused)] #![allow(unused)]
use hyper::header::*; use hyper::header::*;
let _ = pretty_env_logger::init(); let _ = pretty_env_logger::try_init();
let mut core = Core::new().unwrap(); let mut core = Core::new().unwrap();
let res = test! { let res = test! {
@@ -100,7 +100,7 @@ macro_rules! test {
fn $name() { fn $name() {
#![allow(unused)] #![allow(unused)]
use hyper::header::*; use hyper::header::*;
let _ = pretty_env_logger::init(); let _ = pretty_env_logger::try_init();
let mut core = Core::new().unwrap(); let mut core = Core::new().unwrap();
let err = test! { let err = test! {
@@ -500,7 +500,7 @@ fn client_keep_alive() {
/* TODO: re-enable once retry works, its currently a flaky test /* TODO: re-enable once retry works, its currently a flaky test
#[test] #[test]
fn client_pooled_socket_disconnected() { 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
let mut core = Core::new().unwrap(); let mut core = Core::new().unwrap();
@@ -585,7 +585,7 @@ mod dispatch_impl {
#[test] #[test]
fn drop_body_before_eof_closes_connection() { fn drop_body_before_eof_closes_connection() {
// https://github.com/hyperium/hyper/issues/1353 // 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
@@ -626,7 +626,7 @@ mod dispatch_impl {
#[test] #[test]
fn dropped_client_closes_connection() { fn dropped_client_closes_connection() {
// https://github.com/hyperium/hyper/issues/1353 // 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
@@ -672,7 +672,7 @@ mod dispatch_impl {
#[test] #[test]
fn drop_client_closes_idle_connections() { 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
@@ -721,7 +721,7 @@ mod dispatch_impl {
#[test] #[test]
fn drop_response_future_closes_in_progress_connection() { 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
@@ -766,7 +766,7 @@ mod dispatch_impl {
#[test] #[test]
fn drop_response_body_closes_in_progress_connection() { 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
@@ -811,7 +811,7 @@ mod dispatch_impl {
#[test] #[test]
fn no_keep_alive_closes_connection() { fn no_keep_alive_closes_connection() {
// https://github.com/hyperium/hyper/issues/1383 // 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();
@@ -850,7 +850,7 @@ mod dispatch_impl {
#[test] #[test]
fn socket_disconnect_closes_idle_conn() { fn socket_disconnect_closes_idle_conn() {
// notably when keep-alive is enabled // 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 server = TcpListener::bind("127.0.0.1:0").unwrap();
let addr = server.local_addr().unwrap(); let addr = server.local_addr().unwrap();

8
tests/server.rs
View File

@@ -260,7 +260,7 @@ fn empty_response_chunked() {
#[test] #[test]
fn empty_response_chunked_without_body_should_set_content_length() { fn empty_response_chunked_without_body_should_set_content_length() {
extern crate pretty_env_logger; extern crate pretty_env_logger;
let _ = pretty_env_logger::init(); let _ = pretty_env_logger::try_init();
let server = serve(); let server = serve();
server.reply() server.reply()
.status(hyper::Ok) .status(hyper::Ok)
@@ -290,7 +290,7 @@ fn empty_response_chunked_without_body_should_set_content_length() {
#[test] #[test]
fn head_response_can_send_content_length() { fn head_response_can_send_content_length() {
extern crate pretty_env_logger; extern crate pretty_env_logger;
let _ = pretty_env_logger::init(); let _ = pretty_env_logger::try_init();
let server = serve(); let server = serve();
server.reply() server.reply()
.status(hyper::Ok) .status(hyper::Ok)
@@ -319,7 +319,7 @@ fn head_response_can_send_content_length() {
#[test] #[test]
fn response_does_not_set_chunked_if_body_not_allowed() { fn response_does_not_set_chunked_if_body_not_allowed() {
extern crate pretty_env_logger; extern crate pretty_env_logger;
let _ = pretty_env_logger::init(); let _ = pretty_env_logger::try_init();
let server = serve(); let server = serve();
server.reply() server.reply()
.status(hyper::StatusCode::NotModified) .status(hyper::StatusCode::NotModified)
@@ -883,7 +883,7 @@ impl Default for ServeOptions {
} }
fn serve_with_options(options: ServeOptions) -> Serve { 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 (addr_tx, addr_rx) = mpsc::channel();
let (msg_tx, msg_rx) = mpsc::channel(); let (msg_tx, msg_rx) = mpsc::channel();