Skip to content

Commit

Permalink
feat(headers): Headers::remove returns the header
Browse files Browse the repository at this point in the history
  • Loading branch information
untitaker committed Aug 23, 2016
1 parent 74136de commit 81e3cef
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 3 deletions.
14 changes: 14 additions & 0 deletions src/header/internals/cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,20 @@ impl<V: ?Sized + Any + 'static> PtrMapCell<V> {
}.map(|val| &mut **val)
}

#[inline]
pub fn into_value(self, key: TypeId) -> Option<Box<V>> {
let map = unsafe { self.0.into_inner() };
match map {
PtrMap::Empty => None,
PtrMap::One(id, v) => if id == key {
Some(v)
} else {
None
},
PtrMap::Many(mut hm) => hm.remove(&key)
}
}

#[inline]
pub unsafe fn insert(&self, key: TypeId, val: Box<V>) {
let mut map = &mut *self.0.get();
Expand Down
8 changes: 8 additions & 0 deletions src/header/internals/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,14 @@ impl Item {
}
self.typed.get_mut(tid).map(|typed| unsafe { typed.downcast_mut_unchecked() })
}

pub fn into_typed<H: Header>(self) -> Option<H> {
let tid = TypeId::of::<H>();
match self.typed.into_value(tid) {
Some(val) => Some(val),
None => parse::<H>(self.raw.as_ref().expect("item.raw must exist")).ok()
}.map(|typed| unsafe { typed.downcast_unchecked() })
}
}

#[inline]
Expand Down
22 changes: 19 additions & 3 deletions src/header/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ impl Header + Send + Sync {
unsafe fn downcast_mut_unchecked<T: 'static>(&mut self) -> &mut T {
&mut *(mem::transmute::<*mut _, (*mut (), *mut ())>(self).0 as *mut T)
}

#[inline]
unsafe fn downcast_unchecked<T: 'static>(self: Box<Self>) -> T {
*Box::from_raw(mem::transmute::<*mut _, (*mut (), *mut ())>(Box::into_raw(self)).0 as *mut T)
}
}

impl Clone for Box<Header + Send + Sync> {
Expand Down Expand Up @@ -320,10 +325,14 @@ impl Headers {
}

/// Removes a header from the map, if one existed.
/// Returns true if a header has been removed.
pub fn remove<H: Header>(&mut self) -> bool {
/// Returns the header, if one has been removed and could be parsed.
///
/// Note that this function may return `None` even though a header was removed. If you want to
/// know whether a header exists, rather rely on `has`.
pub fn remove<H: Header>(&mut self) -> Option<H> {
trace!("Headers.remove( {:?} )", header_name::<H>());
self.data.remove(&HeaderName(UniCase(Cow::Borrowed(header_name::<H>())))).is_some()
self.data.remove(&HeaderName(UniCase(Cow::Borrowed(header_name::<H>()))))
.and_then(Item::into_typed::<H>)
}

/// Returns an iterator over the header fields.
Expand Down Expand Up @@ -751,6 +760,13 @@ mod tests {
assert_eq!(headers.get_raw("Content-length"), None);
}

#[test]
fn test_remove() {
let mut headers = Headers::new();
headers.set(ContentLength(10));
assert_eq!(headers.remove(), Some(ContentLength(10)));
}

#[test]
fn test_len() {
let mut headers = Headers::new();
Expand Down

0 comments on commit 81e3cef

Please sign in to comment.