refactor(header): Implement HttpDate, a wrapper for dates

Using `time::Tm` directly in HTTP header fields requires special handling to parse and format
the header values., this stops us from using the header macros. By wrapping `time::Time` in a
`HttpDate`, we can use the `FromStr` and `Display` traits of `HttpDate` like for most other values.

BREAKING_CHANGE: All code using one of the `Date`, `Expires`, `If-Modified-Since`,
`If-Unmodified-Since`, `Last-Modified` header fields needs to wrap `time::Tm`
with `HttpDate`. Removed `FromStr` trait of `Date`, `If-Modified-Sice` and `If-Unmodified-Sice`,
implementing the trait here is inconsistent with other headers.
This commit is contained in:
Pyfisch
2015-03-31 17:29:31 +02:00
parent 4c5a42bcda
commit 6cf052bf0f
10 changed files with 110 additions and 262 deletions

View File

@@ -1,44 +1,9 @@
use std::fmt;
use std::str::FromStr;
use time::Tm;
use header::{Header, HeaderFormat};
use header::parsing::from_one_raw_str;
use header::parsing::tm_from_str;
use header::HttpDate;
/// The `If-Modified-Since` header field.
#[derive(Copy, PartialEq, Clone, Debug)]
pub struct IfModifiedSince(pub Tm);
deref!(IfModifiedSince => Tm);
impl Header for IfModifiedSince {
fn header_name() -> &'static str {
"If-Modified-Since"
}
fn parse_header(raw: &[Vec<u8>]) -> Option<IfModifiedSince> {
from_one_raw_str(raw)
}
}
impl HeaderFormat for IfModifiedSince {
fn fmt_header(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let tm = self.0;
let tm = match tm.tm_utcoff {
0 => tm,
_ => tm.to_utc(),
};
fmt::Display::fmt(&tm.rfc822(), fmt)
}
}
impl FromStr for IfModifiedSince {
type Err = ();
fn from_str(s: &str) -> Result<IfModifiedSince, ()> {
tm_from_str(s).map(IfModifiedSince).ok_or(())
}
}
pub struct IfModifiedSince(pub HttpDate);
impl_header!(IfModifiedSince, "If-Modified-Since", HttpDate);
bench_header!(imf_fixdate, IfModifiedSince, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });
bench_header!(rfc_850, IfModifiedSince, { vec![b"Sunday, 06-Nov-94 08:49:37 GMT".to_vec()] });