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:
@@ -1,45 +1,10 @@
|
||||
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;
|
||||
|
||||
// Egh, replace as soon as something better than time::Tm exists.
|
||||
/// The `Date` header field.
|
||||
#[derive(Copy, PartialEq, Clone, Debug)]
|
||||
pub struct Date(pub Tm);
|
||||
pub struct Date(pub HttpDate);
|
||||
|
||||
deref!(Date => Tm);
|
||||
|
||||
impl Header for Date {
|
||||
fn header_name() -> &'static str {
|
||||
"Date"
|
||||
}
|
||||
|
||||
fn parse_header(raw: &[Vec<u8>]) -> Option<Date> {
|
||||
from_one_raw_str(raw)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl HeaderFormat for Date {
|
||||
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 Date {
|
||||
type Err = ();
|
||||
fn from_str(s: &str) -> Result<Date, ()> {
|
||||
tm_from_str(s).map(Date).ok_or(())
|
||||
}
|
||||
}
|
||||
impl_header!(Date, "Date", HttpDate);
|
||||
|
||||
bench_header!(imf_fixdate, Date, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });
|
||||
bench_header!(rfc_850, Date, { vec![b"Sunday, 06-Nov-94 08:49:37 GMT".to_vec()] });
|
||||
|
||||
@@ -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 `Expires` header field.
|
||||
#[derive(Copy, PartialEq, Clone, Debug)]
|
||||
pub struct Expires(pub Tm);
|
||||
|
||||
deref!(Expires => Tm);
|
||||
|
||||
impl Header for Expires {
|
||||
fn header_name() -> &'static str {
|
||||
"Expires"
|
||||
}
|
||||
|
||||
fn parse_header(raw: &[Vec<u8>]) -> Option<Expires> {
|
||||
from_one_raw_str(raw)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl HeaderFormat for Expires {
|
||||
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 Expires {
|
||||
type Err = ();
|
||||
fn from_str(s: &str) -> Result<Expires, ()> {
|
||||
tm_from_str(s).map(Expires).ok_or(())
|
||||
}
|
||||
}
|
||||
pub struct Expires(pub HttpDate);
|
||||
impl_header!(Expires, "Expires", HttpDate);
|
||||
|
||||
bench_header!(imf_fixdate, Expires, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });
|
||||
bench_header!(rfc_850, Expires, { vec![b"Sunday, 06-Nov-94 08:49:37 GMT".to_vec()] });
|
||||
|
||||
@@ -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()] });
|
||||
|
||||
@@ -1,44 +1,10 @@
|
||||
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-Unmodified-Since` header field.
|
||||
#[derive(Copy, PartialEq, Clone, Debug)]
|
||||
pub struct IfUnmodifiedSince(pub Tm);
|
||||
pub struct IfUnmodifiedSince(pub HttpDate);
|
||||
|
||||
deref!(IfUnmodifiedSince => Tm);
|
||||
|
||||
impl Header for IfUnmodifiedSince {
|
||||
fn header_name() -> &'static str {
|
||||
"If-Unmodified-Since"
|
||||
}
|
||||
|
||||
fn parse_header(raw: &[Vec<u8>]) -> Option<IfUnmodifiedSince> {
|
||||
from_one_raw_str(raw)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl HeaderFormat for IfUnmodifiedSince {
|
||||
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 IfUnmodifiedSince {
|
||||
type Err = ();
|
||||
fn from_str(s: &str) -> Result<IfUnmodifiedSince, ()> {
|
||||
tm_from_str(s).map(IfUnmodifiedSince).ok_or(())
|
||||
}
|
||||
}
|
||||
impl_header!(IfUnmodifiedSince, "If-Unmodified-Since", HttpDate);
|
||||
|
||||
bench_header!(imf_fixdate, IfUnmodifiedSince, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });
|
||||
bench_header!(rfc_850, IfUnmodifiedSince, { vec![b"Sunday, 06-Nov-94 08:49:37 GMT".to_vec()] });
|
||||
|
||||
@@ -1,44 +1,10 @@
|
||||
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 `LastModified` header field.
|
||||
#[derive(Copy, PartialEq, Clone, Debug)]
|
||||
pub struct LastModified(pub Tm);
|
||||
pub struct LastModified(pub HttpDate);
|
||||
|
||||
deref!(LastModified => Tm);
|
||||
|
||||
impl Header for LastModified {
|
||||
fn header_name() -> &'static str {
|
||||
"Last-Modified"
|
||||
}
|
||||
|
||||
fn parse_header(raw: &[Vec<u8>]) -> Option<LastModified> {
|
||||
from_one_raw_str(raw)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
impl HeaderFormat for LastModified {
|
||||
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 LastModified {
|
||||
type Err = ();
|
||||
fn from_str(s: &str) -> Result<LastModified, ()> {
|
||||
tm_from_str(s).map(LastModified).ok_or(())
|
||||
}
|
||||
}
|
||||
impl_header!(LastModified, "Last-Modified", HttpDate);
|
||||
|
||||
bench_header!(imf_fixdate, LastModified, { vec![b"Sun, 07 Nov 1994 08:48:37 GMT".to_vec()] });
|
||||
bench_header!(rfc_850, LastModified, { vec![b"Sunday, 06-Nov-94 08:49:37 GMT".to_vec()] });
|
||||
|
||||
Reference in New Issue
Block a user