Merge pull request #444 from brandonson/master

feat(http): Implement Debug for HttpReader/Writer.
This commit is contained in:
Sean McArthur
2015-04-08 18:30:55 -07:00
3 changed files with 26 additions and 0 deletions

View File

@@ -14,6 +14,7 @@ use version;
use HttpResult;
/// A response for a client request to a remote server.
#[derive(Debug)]
pub struct Response<S = HttpStream> {
/// The status from the server.
pub status: status::StatusCode,

View File

@@ -2,6 +2,7 @@
use std::borrow::{Cow, ToOwned};
use std::cmp::min;
use std::io::{self, Read, Write, BufRead};
use std::fmt;
use httparse;
@@ -60,6 +61,18 @@ impl<R: Read> HttpReader<R> {
}
}
impl<R> fmt::Debug for HttpReader<R> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match *self {
SizedReader(_,rem) => write!(fmt, "SizedReader(remaining={:?})", rem),
ChunkedReader(_, None) => write!(fmt, "ChunkedReader(chunk_remaining=unknown)"),
ChunkedReader(_, Some(rem)) => write!(fmt, "ChunkedReader(chunk_remaining={:?})", rem),
EofReader(_) => write!(fmt, "EofReader"),
EmptyReader(_) => write!(fmt, "EmptyReader"),
}
}
}
impl<R: Read> Read for HttpReader<R> {
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
match *self {
@@ -305,6 +318,17 @@ impl<W: Write> Write for HttpWriter<W> {
}
}
impl<W: Write> fmt::Debug for HttpWriter<W> {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
match *self {
ThroughWriter(_) => write!(fmt, "ThroughWriter"),
ChunkedWriter(_) => write!(fmt, "ChunkedWriter"),
SizedWriter(_, rem) => write!(fmt, "SizedWriter(remaining={:?})", rem),
EmptyWriter(_) => write!(fmt, "EmptyWriter"),
}
}
}
const MAX_HEADERS: usize = 100;
/// Parses a request into an Incoming message head.

View File

@@ -15,6 +15,7 @@ use net::{Fresh, Streaming};
use version;
/// The outgoing half for a Tcp connection, created by a `Server` and given to a `Handler`.
#[derive(Debug)]
pub struct Response<'a, W = Fresh> {
/// The HTTP version of this response.
pub version: version::HttpVersion,