Skip to content

Avoid unnecessary .expect()s for empty HeaderMap #768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions src/header/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -445,8 +445,21 @@ impl HeaderMap {
/// assert!(map.is_empty());
/// assert_eq!(0, map.capacity());
/// ```
#[inline]
pub fn new() -> Self {
HeaderMap::try_with_capacity(0).unwrap()
Self::default()
}
}

impl<T> Default for HeaderMap<T> {
fn default() -> Self {
HeaderMap {
mask: 0,
indices: Box::new([]), // as a ZST, this doesn't actually allocate anything
entries: Vec::new(),
extra_values: Vec::new(),
danger: Danger::Green,
}
}
}

Expand Down Expand Up @@ -501,13 +514,7 @@ impl<T> HeaderMap<T> {
/// ```
pub fn try_with_capacity(capacity: usize) -> Result<HeaderMap<T>, MaxSizeReached> {
if capacity == 0 {
Ok(HeaderMap {
mask: 0,
indices: Box::new([]), // as a ZST, this doesn't actually allocate anything
entries: Vec::new(),
extra_values: Vec::new(),
danger: Danger::Green,
})
Ok(Self::default())
} else {
let raw_cap = match to_raw_capacity(capacity).checked_next_power_of_two() {
Some(c) => c,
Expand Down Expand Up @@ -2164,12 +2171,6 @@ impl<T: fmt::Debug> fmt::Debug for HeaderMap<T> {
}
}

impl<T> Default for HeaderMap<T> {
fn default() -> Self {
HeaderMap::try_with_capacity(0).expect("zero capacity should never fail")
}
}

impl<K, T> ops::Index<K> for HeaderMap<T>
where
K: AsHeaderName,
Expand Down
Loading