refactor(hyper): remove need for collections feature

This commit is contained in:
Sean McArthur
2015-03-27 11:50:14 -07:00
parent b04f6d8e7a
commit a62323cafe
4 changed files with 23 additions and 20 deletions

View File

@@ -356,11 +356,21 @@ mod tests {
use test::Bencher;
// Slice.position_elem is unstable
fn index_of(slice: &[u8], byte: u8) -> Option<usize> {
for (index, &b) in slice.iter().enumerate() {
if b == byte {
return Some(index);
}
}
None
}
macro_rules! raw {
($($line:expr),*) => ({
[$({
let line = $line;
let pos = line.position_elem(&b':').expect("raw splits on :, not found");
let pos = index_of(line, b':').expect("raw splits on ':', not found");
httparse::Header {
name: ::std::str::from_utf8(&line[..pos]).unwrap(),
value: &line[pos + 2..]

View File

@@ -47,29 +47,29 @@ impl FromStr for EntityTag {
// Early exits:
// 1. The string is empty, or,
// 2. it doesn't terminate in a DQUOTE.
if slice.is_empty() || !slice.ends_with("\"") {
if slice.is_empty() || !slice.ends_with('"') {
return Err(());
}
// The etag is weak if its first char is not a DQUOTE.
if slice.chars().next().unwrap() == '"' /* '"' */ {
if slice.starts_with('"') /* '"' */ {
// No need to check if the last char is a DQUOTE,
// we already did that above.
if check_slice_validity(slice.slice_chars(1, length-1)) {
if check_slice_validity(&slice[1..length-1]) {
return Ok(EntityTag {
weak: false,
tag: slice.slice_chars(1, length-1).to_string()
tag: slice[1..length-1].to_string()
});
} else {
return Err(());
}
}
if slice.slice_chars(0, 3) == "W/\"" {
if check_slice_validity(slice.slice_chars(3, length-1)) {
if slice.starts_with("W/\"") {
if check_slice_validity(&slice[3..length-1]) {
return Ok(EntityTag {
weak: true,
tag: slice.slice_chars(3, length-1).to_string()
tag: slice[3..length-1].to_string()
});
} else {
return Err(());