Skip to content

Commit

Permalink
Use renamed unsafe_get and concat_vec methods.
Browse files Browse the repository at this point in the history
Changed calls to unsafe_get to use get_unchecked and calls to concat_vec
to use concat to avoid deprecation lints.
  • Loading branch information
mkovalchik authored and seanmonstar committed Jan 2, 2015
1 parent 6ecb39e commit 5dd4529
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/header/common/authorization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl<S: Scheme> Header for Authorization<S> {

fn parse_header(raw: &[Vec<u8>]) -> Option<Authorization<S>> {
if raw.len() == 1 {
match (from_utf8(unsafe { raw[].unsafe_get(0)[] }), Scheme::scheme(None::<S>)) {
match (from_utf8(unsafe { raw[].get_unchecked(0)[] }), Scheme::scheme(None::<S>)) {
(Ok(header), Some(scheme))
if header.starts_with(scheme) && header.len() > scheme.len() + 1 => {
header[scheme.len() + 1..].parse::<S>().map(|s| Authorization(s))
Expand Down
2 changes: 1 addition & 1 deletion src/header/common/cache_control.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ impl Header for CacheControl {
let directives = raw.iter()
.filter_map(|line| from_one_comma_delimited(line[]))
.collect::<Vec<Vec<CacheDirective>>>()
.concat_vec();
.concat();
if directives.len() > 0 {
Some(CacheControl(directives))
} else {
Expand Down
4 changes: 2 additions & 2 deletions src/header/common/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ pub fn from_one_raw_str<T: FromStr>(raw: &[Vec<u8>]) -> Option<T> {
return None;
}
// we JUST checked that raw.len() == 1, so raw[0] WILL exist.
match from_utf8(unsafe { raw[].unsafe_get(0)[] }) {
match from_utf8(unsafe { raw[].get_unchecked(0)[] }) {
Ok(s) => FromStr::from_str(s),
Err(_) => None
}
Expand All @@ -23,7 +23,7 @@ pub fn from_comma_delimited<T: FromStr>(raw: &[Vec<u8>]) -> Option<Vec<T>> {
return None;
}
// we JUST checked that raw.len() == 1, so raw[0] WILL exist.
from_one_comma_delimited(unsafe { raw.as_slice().unsafe_get(0).as_slice() })
from_one_comma_delimited(unsafe { raw.as_slice().get_unchecked(0).as_slice() })
}

/// Reads a comma-delimited raw string into a Vec.
Expand Down

0 comments on commit 5dd4529

Please sign in to comment.