From d624b0ef29020c6085ec94651a990f58ccd684e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 14 Nov 2016 20:49:37 +0200 Subject: [PATCH] Implement std::fmt::Debug for all public types --- src/body.rs | 11 +++++++++++ src/client.rs | 3 +++ src/redirect.rs | 1 + src/tls.rs | 8 ++++++++ 4 files changed, 23 insertions(+) diff --git a/src/body.rs b/src/body.rs index 43ae94b51..cd5c3ccda 100644 --- a/src/body.rs +++ b/src/body.rs @@ -1,7 +1,9 @@ use std::io::Read; use std::fs::File; +use std::fmt; /// Body type for a request. +#[derive(Debug)] pub struct Body { reader: Kind, } @@ -71,6 +73,15 @@ impl From for Body { } } +impl fmt::Debug for Kind { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + match self { + &Kind::Reader(_, ref v) => f.debug_tuple("Kind::Reader").field(&"_").field(v).finish(), + &Kind::Bytes(ref v) => f.debug_tuple("Kind::Bytes").field(v).finish(), + } + } +} + // Wraps a `std::io::Write`. //pub struct Pipe(Kind); diff --git a/src/client.rs b/src/client.rs index b3d675f86..8f20346af 100644 --- a/src/client.rs +++ b/src/client.rs @@ -22,6 +22,7 @@ static DEFAULT_USER_AGENT: &'static str = concat!(env!("CARGO_PKG_NAME"), "/", e /// /// The `Client` holds a connection pool internally, so it is advised that /// you create one and reuse it. +#[derive(Debug)] pub struct Client { inner: ::hyper::Client, } @@ -81,6 +82,7 @@ fn new_hyper_client() -> ::Result<::hyper::Client> { /// A builder to construct the properties of a `Request`. +#[derive(Debug)] pub struct RequestBuilder<'a> { client: &'a Client, @@ -253,6 +255,7 @@ impl<'a> RequestBuilder<'a> { } /// A Response to a submitted `Request`. +#[derive(Debug)] pub struct Response { inner: ::hyper::client::Response, } diff --git a/src/redirect.rs b/src/redirect.rs index 960e602f9..4fbd22aa3 100644 --- a/src/redirect.rs +++ b/src/redirect.rs @@ -1,3 +1,4 @@ +#[derive(Debug)] pub struct RedirectPolicy { inner: () } diff --git a/src/tls.rs b/src/tls.rs index a085bdec2..6bb607029 100644 --- a/src/tls.rs +++ b/src/tls.rs @@ -1,6 +1,7 @@ use std::io::{self, Read, Write}; use std::net::SocketAddr; use std::time::Duration; +use std::fmt; use hyper::net::{SslClient, HttpStream, NetworkStream}; use native_tls::{TlsConnector, TlsStream as NativeTlsStream, HandshakeError}; @@ -34,6 +35,13 @@ impl SslClient for TlsClient { } } +impl fmt::Debug for TlsClient { + fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { + f.debug_tuple("TlsClient").field(&"_").finish() + } +} + +#[derive(Debug)] pub struct TlsStream(NativeTlsStream); impl Read for TlsStream {