6cf052bf0f
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.
53 lines
1.5 KiB
Rust
53 lines
1.5 KiB
Rust
//! Utility functions for Header implementations.
|
|
|
|
use std::str;
|
|
use std::fmt;
|
|
|
|
/// Reads a single raw string when parsing a header
|
|
pub fn from_one_raw_str<T: str::FromStr>(raw: &[Vec<u8>]) -> Option<T> {
|
|
if raw.len() != 1 {
|
|
return None;
|
|
}
|
|
// we JUST checked that raw.len() == 1, so raw[0] WILL exist.
|
|
match str::from_utf8(&raw[0][..]) {
|
|
Ok(s) => str::FromStr::from_str(s).ok(),
|
|
Err(_) => None
|
|
}
|
|
}
|
|
|
|
/// Reads a comma-delimited raw header into a Vec.
|
|
#[inline]
|
|
pub fn from_comma_delimited<T: str::FromStr>(raw: &[Vec<u8>]) -> Option<Vec<T>> {
|
|
if raw.len() != 1 {
|
|
return None;
|
|
}
|
|
// we JUST checked that raw.len() == 1, so raw[0] WILL exist.
|
|
from_one_comma_delimited(&raw[0][..])
|
|
}
|
|
|
|
/// Reads a comma-delimited raw string into a Vec.
|
|
pub fn from_one_comma_delimited<T: str::FromStr>(raw: &[u8]) -> Option<Vec<T>> {
|
|
match str::from_utf8(raw) {
|
|
Ok(s) => {
|
|
Some(s
|
|
.split(',')
|
|
.map(|x| x.trim())
|
|
.filter_map(|x| x.parse().ok())
|
|
.collect())
|
|
}
|
|
Err(_) => None
|
|
}
|
|
}
|
|
|
|
/// Format an array into a comma-delimited string.
|
|
pub fn fmt_comma_delimited<T: fmt::Display>(fmt: &mut fmt::Formatter, parts: &[T]) -> fmt::Result {
|
|
let last = parts.len() - 1;
|
|
for (i, part) in parts.iter().enumerate() {
|
|
try!(write!(fmt, "{}", part));
|
|
if i < last {
|
|
try!(write!(fmt, ", "));
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|