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

Use rustfmt to enforce consistent formatting

Browse Source 
This change adds a .rustfmt.toml that includes ALL supported settings,
12 of which we have overridden to attempt to cater to our own
proclivities.

rustfmt is checked in the rust-nightly CI job.
This commit is contained in:
Oliver Gould
2017-09-08 17:20:41 +00:00
parent 93925e6d1f
commit 897bf84163
60 changed files with 2087 additions and 1620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
src/hpack/header.rs
View File

@@ -1,17 +1,14 @@
use super::DecoderError;
use bytes::Bytes;
use http::{Method, StatusCode};
use http::header::{HeaderName, HeaderValue};
use bytes::Bytes;
use string::{String, TryFrom};
/// HTTP/2.0 Header
#[derive(Debug, Clone, Eq, PartialEq)]
pub enum Header<T = HeaderName> {
Field {
name: T,
value: HeaderValue,
},
Field { name: T, value: HeaderValue },
// TODO: Change these types to `http::uri` types.
Authority(String<Bytes>),
Method(Method),
@@ -41,14 +38,25 @@ impl Header<Option<HeaderName>> {
use self::Header::*;
Ok(match self {
Field { name: Some(n), value } => Field { name: n, value: value },
Field { name: None, value } => return Err(value),
Authority(v) => Authority(v),
Method(v) => Method(v),
Scheme(v) => Scheme(v),
Path(v) => Path(v),
Status(v) => Status(v),
})
Field {
name: Some(n),
value,
} => {
Field {
name: n,
value: value,
}
}
Field {
name: None,
value,
} => return Err(value),
Authority(v) => Authority(v),
Method(v) => Method(v),
Scheme(v) => Scheme(v),
Path(v) => Path(v),
Status(v) => Status(v),
})
}
}
@@ -57,65 +65,59 @@ impl Header {
if name[0] == b':' {
match &name[1..] {
b"authority" => {
let value = try!(String::try_from(value));
let value = String::try_from(value)?;
Ok(Header::Authority(value))
}
b"method" => {
let method = try!(Method::from_bytes(&value));
let method = Method::from_bytes(&value)?;
Ok(Header::Method(method))
}
b"scheme" => {
let value = try!(String::try_from(value));
let value = String::try_from(value)?;
Ok(Header::Scheme(value))
}
b"path" => {
let value = try!(String::try_from(value));
let value = String::try_from(value)?;
Ok(Header::Path(value))
}
b"status" => {
let status = try!(StatusCode::from_bytes(&value));
let status = StatusCode::from_bytes(&value)?;
Ok(Header::Status(status))
}
_ => {
Err(DecoderError::InvalidPseudoheader)
}
_ => Err(DecoderError::InvalidPseudoheader),
}
} else {
// HTTP/2 requires lower case header names
let name = try!(HeaderName::from_lowercase(&name));
let value = try!(HeaderValue::from_bytes(&value));
let name = HeaderName::from_lowercase(&name)?;
let value = HeaderValue::from_bytes(&value)?;
Ok(Header::Field { name: name, value: value })
Ok(Header::Field {
name: name,
value: value,
})
}
}
pub fn len(&self) -> usize {
match *self {
Header::Field { ref name, ref value } => {
len(name, value)
}
Header::Authority(ref v) => {
32 + 10 + v.len()
}
Header::Method(ref v) => {
32 + 7 + v.as_ref().len()
}
Header::Scheme(ref v) => {
32 + 7 + v.len()
}
Header::Path(ref v) => {
32 + 5 + v.len()
}
Header::Status(_) => {
32 + 7 + 3
}
Header::Field {
ref name,
ref value,
} => len(name, value),
Header::Authority(ref v) => 32 + 10 + v.len(),
Header::Method(ref v) => 32 + 7 + v.as_ref().len(),
Header::Scheme(ref v) => 32 + 7 + v.len(),
Header::Path(ref v) => 32 + 5 + v.len(),
Header::Status(_) => 32 + 7 + 3,
}
}
/// Returns the header name
pub fn name(&self) -> Name {
match *self {
Header::Field { ref name, .. } => Name::Field(name),
Header::Field {
ref name, ..
} => Name::Field(name),
Header::Authority(..) => Name::Authority,
Header::Method(..) => Name::Method,
Header::Scheme(..) => Name::Scheme,
@@ -126,7 +128,9 @@ impl Header {
pub fn value_slice(&self) -> &[u8] {
match *self {
Header::Field { ref value, .. } => value.as_ref(),
Header::Field {
ref value, ..
} => value.as_ref(),
Header::Authority(ref v) => v.as_ref(),
Header::Method(ref v) => v.as_ref().as_ref(),
Header::Scheme(ref v) => v.as_ref(),
@@ -137,10 +141,14 @@ impl Header {
pub fn value_eq(&self, other: &Header) -> bool {
match *self {
Header::Field { ref value, .. } => {
Header::Field {
ref value, ..
} => {
let a = value;
match *other {
Header::Field { ref value, .. } => a == value,
Header::Field {
ref value, ..
} => a == value,
_ => false,
}
}
@@ -179,7 +187,9 @@ impl Header {
pub fn is_sensitive(&self) -> bool {
match *self {
Header::Field { ref value, .. } => value.is_sensitive(),
Header::Field {
ref value, ..
} => value.is_sensitive(),
// TODO: Technically these other header values can be sensitive too.
_ => false,
}
@@ -189,17 +199,19 @@ impl Header {
use http::header;
match *self {
Header::Field { ref name, .. } => {
Header::Field {
ref name, ..
} => {
match *name {
header::AGE |
header::AUTHORIZATION |
header::CONTENT_LENGTH |
header::ETAG |
header::IF_MODIFIED_SINCE |
header::IF_NONE_MATCH |
header::LOCATION |
header::COOKIE |
header::SET_COOKIE => true,
header::AUTHORIZATION |
header::CONTENT_LENGTH |
header::ETAG |
header::IF_MODIFIED_SINCE |
header::IF_NONE_MATCH |
header::LOCATION |
header::COOKIE |
header::SET_COOKIE => true,
_ => false,
}
}
@@ -213,7 +225,15 @@ impl Header {
impl From<Header> for Header<Option<HeaderName>> {
fn from(src: Header) -> Self {
match src {
Header::Field { name, value } => Header::Field { name: Some(name), value },
Header::Field {
name,
value,
} => {
Header::Field {
name: Some(name),
value,
}
}
Header::Authority(v) => Header::Authority(v),
Header::Method(v) => Header::Method(v),
Header::Scheme(v) => Header::Scheme(v),
@@ -228,22 +248,14 @@ impl<'a> Name<'a> {
match self {
Name::Field(name) => {
Ok(Header::Field {
name: name.clone(),
value: try!(HeaderValue::from_bytes(&*value)),
})
}
Name::Authority => {
Ok(Header::Authority(try!(String::try_from(value))))
}
Name::Method => {
Ok(Header::Method(try!(Method::from_bytes(&*value))))
}
Name::Scheme => {
Ok(Header::Scheme(try!(String::try_from(value))))
}
Name::Path => {
Ok(Header::Path(try!(String::try_from(value))))
name: name.clone(),
value: HeaderValue::from_bytes(&*value)?,
})
}
Name::Authority => Ok(Header::Authority(String::try_from(value)?)),
Name::Method => Ok(Header::Method(Method::from_bytes(&*value)?)),
Name::Scheme => Ok(Header::Scheme(String::try_from(value)?)),
Name::Path => Ok(Header::Path(String::try_from(value)?)),
Name::Status => {
match StatusCode::from_bytes(&value) {
Ok(status) => Ok(Header::Status(status)),