forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #128 from reem/find-equiv

Browse Source 
Rust update
This commit is contained in:
Sean McArthur
2014-11-19 15:28:43 -08:00
parent 5e92d826d4 7f2a01fca3
commit 52ede44a2a
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
benches/client_mock_tcp.rs
View File

@@ -6,7 +6,7 @@ extern crate hyper;
extern crate test; extern crate test;
use std::fmt::{mod, Show}; use std::fmt::{mod, Show};
use std::from_str::from_str; use std::str::from_str;
use std::io::{IoResult, MemReader}; use std::io::{IoResult, MemReader};
use std::io::net::ip::{SocketAddr, ToSocketAddr}; use std::io::net::ip::{SocketAddr, ToSocketAddr};
use std::os; use std::os;
@@ -55,7 +55,7 @@ impl Writer for MockStream {
#[bench] #[bench]
fn bench_mock_curl(b: &mut test::Bencher) { fn bench_mock_curl(b: &mut test::Bencher) {
let mut cwd = os::getcwd(); let mut cwd = os::getcwd().unwrap();
cwd.push("README.md"); cwd.push("README.md");
let s = format!("file://{}", cwd.container_as_str().unwrap()); let s = format!("file://{}", cwd.container_as_str().unwrap());
let url = s.as_slice(); let url = s.as_slice();

23
src/header/mod.rs
View File

@@ -145,17 +145,20 @@ impl Headers {
/// let raw_content_type = headers.get_raw("content-type"); /// let raw_content_type = headers.get_raw("content-type");
/// ``` /// ```
pub fn get_raw(&self, name: &str) -> Option<&[Vec<u8>]> { pub fn get_raw(&self, name: &str) -> Option<&[Vec<u8>]> {
self.data.find_equiv(&CaseInsensitive(name)).and_then(|item| { self.data
let lock = item.read(); // FIXME(reem): Find a better way to do this lookup without find_equiv.
if let Some(ref raw) = lock.raw { .get(&CaseInsensitive(Slice(unsafe { mem::transmute::<&str, &str>(name) })))
return unsafe { mem::transmute(Some(raw[])) }; .and_then(|item| {
} let lock = item.read();
if let Some(ref raw) = lock.raw {
return unsafe { mem::transmute(Some(raw[])) };
}
let mut lock = item.write(); let mut lock = item.write();
let raw = vec![lock.typed.as_ref().unwrap().to_string().into_bytes()]; let raw = vec![lock.typed.as_ref().unwrap().to_string().into_bytes()];
lock.raw = Some(raw); lock.raw = Some(raw);
unsafe { mem::transmute(Some(lock.raw.as_ref().unwrap()[])) } unsafe { mem::transmute(Some(lock.raw.as_ref().unwrap()[])) }
}) })
} }
/// Set the raw value of a header, bypassing any typed headers. /// Set the raw value of a header, bypassing any typed headers.