Skip to content

Commit 0d73269

Browse files
Marwesseanmonstar
Marwes
authored and
seanmonstar
committed
Format the crate (hyperium#50)
1 parent 417f01b commit 0d73269

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+487
-624
lines changed

‎headers-core/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ extern crate http;
1313

1414
pub use http::header::{self, HeaderName, HeaderValue};
1515

16-
use std::fmt::{self, Display, Formatter};
1716
use std::error;
17+
use std::fmt::{self, Display, Formatter};
1818

1919
/// A trait for any object that will represent a header field and value.
2020
///

‎src/common/access_control_allow_credentials.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use ::{Header, HeaderName, HeaderValue};
1+
use {Header, HeaderName, HeaderValue};
22

33
/// `Access-Control-Allow-Credentials` header, part of
44
/// [CORS](http://www.w3.org/TR/cors/#access-control-allow-headers-response-header)
@@ -55,4 +55,3 @@ impl Header for AccessControlAllowCredentials {
5555
values.extend(::std::iter::once(HeaderValue::from_static("true")));
5656
}
5757
}
58-

‎src/common/access_control_allow_headers.rs‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::iter::FromIterator;
22

3-
use {HeaderName, HeaderValue};
43
use util::FlatCsv;
4+
use {HeaderName, HeaderValue};
55

66
/// `Access-Control-Allow-Headers` header, part of
77
/// [CORS](http://www.w3.org/TR/cors/#access-control-allow-headers-response-header)
@@ -42,12 +42,9 @@ derive_header! {
4242
impl AccessControlAllowHeaders {
4343
/// Returns an iterator over `HeaderName`s contained within.
4444
pub fn iter<'a>(&'a self) -> impl Iterator<Item = HeaderName> + 'a {
45-
self
46-
.0
45+
self.0
4746
.iter()
48-
.map(|s| {
49-
s.parse().ok()
50-
})
47+
.map(|s| s.parse().ok())
5148
.take_while(|val| val.is_some())
5249
.filter_map(|val| val)
5350
}
@@ -58,24 +55,19 @@ impl FromIterator<HeaderName> for AccessControlAllowHeaders {
5855
where
5956
I: IntoIterator<Item = HeaderName>,
6057
{
61-
let flat = iter
62-
.into_iter()
63-
.map(HeaderValue::from)
64-
.collect();
58+
let flat = iter.into_iter().map(HeaderValue::from).collect();
6559
AccessControlAllowHeaders(flat)
6660
}
6761
}
6862

6963
#[cfg(test)]
7064
mod tests {
71-
use super::*;
7265
use super::super::{test_decode, test_encode};
66+
use super::*;
7367

7468
#[test]
7569
fn iter() {
76-
let allow_headers = test_decode::<AccessControlAllowHeaders>(
77-
&["foo, bar"]
78-
).unwrap();
70+
let allow_headers = test_decode::<AccessControlAllowHeaders>(&["foo, bar"]).unwrap();
7971

8072
let as_vec = allow_headers.iter().collect::<Vec<_>>();
8173
assert_eq!(as_vec.len(), 2);
@@ -85,22 +77,22 @@ mod tests {
8577

8678
#[test]
8779
fn from_iter() {
88-
let allow: AccessControlAllowHeaders = vec![
89-
::http::header::CACHE_CONTROL,
90-
::http::header::IF_RANGE,
91-
].into_iter().collect();
80+
let allow: AccessControlAllowHeaders =
81+
vec![::http::header::CACHE_CONTROL, ::http::header::IF_RANGE]
82+
.into_iter()
83+
.collect();
9284

9385
let headers = test_encode(allow);
94-
assert_eq!(headers["access-control-allow-headers"], "cache-control, if-range");
86+
assert_eq!(
87+
headers["access-control-allow-headers"],
88+
"cache-control, if-range"
89+
);
9590
}
9691

9792
#[test]
9893
fn test_with_invalid() {
99-
let allow_headers = test_decode::<AccessControlAllowHeaders>(
100-
&["foo foo, bar"]
101-
).unwrap();
94+
let allow_headers = test_decode::<AccessControlAllowHeaders>(&["foo foo, bar"]).unwrap();
10295

10396
assert!(allow_headers.iter().collect::<Vec<_>>().is_empty());
10497
}
10598
}
106-

‎src/common/access_control_allow_methods.rs‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,14 @@ derive_header! {
4343
impl AccessControlAllowMethods {
4444
/// Returns an iterator over `Method`s contained within.
4545
pub fn iter<'a>(&'a self) -> impl Iterator<Item = Method> + 'a {
46-
self
47-
.0
48-
.iter()
49-
.filter_map(|s| {
50-
s.parse().ok()
51-
})
46+
self.0.iter().filter_map(|s| s.parse().ok())
5247
}
5348
}
5449

5550
impl FromIterator<Method> for AccessControlAllowMethods {
5651
fn from_iter<I>(iter: I) -> Self
5752
where
58-
I: IntoIterator<Item=Method>,
53+
I: IntoIterator<Item = Method>,
5954
{
6055
let methods = iter
6156
.into_iter()
@@ -73,14 +68,12 @@ impl FromIterator<Method> for AccessControlAllowMethods {
7368

7469
#[cfg(test)]
7570
mod tests {
76-
use super::*;
7771
use super::super::{test_decode, test_encode};
72+
use super::*;
7873

7974
#[test]
8075
fn iter() {
81-
let allowed = test_decode::<AccessControlAllowMethods>(
82-
&["GET, PUT"]
83-
).unwrap();
76+
let allowed = test_decode::<AccessControlAllowMethods>(&["GET, PUT"]).unwrap();
8477

8578
let as_vec = allowed.iter().collect::<Vec<_>>();
8679
assert_eq!(as_vec.len(), 2);
@@ -90,13 +83,9 @@ mod tests {
9083

9184
#[test]
9285
fn from_iter() {
93-
let allow: AccessControlAllowMethods = vec![
94-
Method::GET,
95-
Method::PUT,
96-
].into_iter().collect();
86+
let allow: AccessControlAllowMethods = vec![Method::GET, Method::PUT].into_iter().collect();
9787

9888
let headers = test_encode(allow);
9989
assert_eq!(headers["access-control-allow-methods"], "GET, PUT");
10090
}
10191
}
102-

‎src/common/access_control_allow_origin.rs‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use ::{HeaderValue};
2-
use ::util::{IterExt, TryFromValues};
3-
use super::origin::{Origin};
1+
use super::origin::Origin;
2+
use util::{IterExt, TryFromValues};
3+
use HeaderValue;
44

55
/// The `Access-Control-Allow-Origin` response header,
66
/// part of [CORS](http://www.w3.org/TR/cors/#access-control-allow-origin-response-header)
@@ -48,13 +48,14 @@ impl AccessControlAllowOrigin {
4848
/// `Access-Control-Allow-Origin: *`
4949
pub const ANY: AccessControlAllowOrigin = AccessControlAllowOrigin(OriginOrAny::Any);
5050
/// `Access-Control-Allow-Origin: null`
51-
pub const NULL: AccessControlAllowOrigin = AccessControlAllowOrigin(OriginOrAny::Origin(Origin::NULL));
51+
pub const NULL: AccessControlAllowOrigin =
52+
AccessControlAllowOrigin(OriginOrAny::Origin(Origin::NULL));
5253

5354
/// Returns the origin if there's one specified.
5455
pub fn origin(&self) -> Option<&Origin> {
5556
match self.0 {
5657
OriginOrAny::Origin(ref origin) => Some(origin),
57-
_ => None
58+
_ => None,
5859
}
5960
}
6061
}
@@ -71,8 +72,7 @@ impl TryFromValues for OriginOrAny {
7172
return Some(OriginOrAny::Any);
7273
}
7374

74-
Origin::try_from_value(value)
75-
.map(OriginOrAny::Origin)
75+
Origin::try_from_value(value).map(OriginOrAny::Origin)
7676
})
7777
.ok_or_else(::Error::invalid)
7878
}
@@ -89,9 +89,8 @@ impl<'a> From<&'a OriginOrAny> for HeaderValue {
8989

9090
#[cfg(test)]
9191
mod tests {
92-
use super::*;
9392
use super::super::{test_decode, test_encode};
94-
93+
use super::*;
9594

9695
#[test]
9796
fn origin() {
@@ -126,4 +125,3 @@ mod tests {
126125
assert_eq!(headers["access-control-allow-origin"], "null");
127126
}
128127
}
129-

‎src/common/access_control_expose_headers.rs‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::iter::FromIterator;
22

3-
use {HeaderName, HeaderValue};
43
use util::FlatCsv;
4+
use {HeaderName, HeaderValue};
55

66
/// `Access-Control-Expose-Headers` header, part of
77
/// [CORS](http://www.w3.org/TR/cors/#access-control-expose-headers-response-header)
@@ -43,12 +43,7 @@ derive_header! {
4343
impl AccessControlExposeHeaders {
4444
/// Returns an iterator over `HeaderName`s contained within.
4545
pub fn iter<'a>(&'a self) -> impl Iterator<Item = HeaderName> + 'a {
46-
self
47-
.0
48-
.iter()
49-
.filter_map(|s| {
50-
s.parse().ok()
51-
})
46+
self.0.iter().filter_map(|s| s.parse().ok())
5247
}
5348
}
5449

@@ -57,24 +52,19 @@ impl FromIterator<HeaderName> for AccessControlExposeHeaders {
5752
where
5853
I: IntoIterator<Item = HeaderName>,
5954
{
60-
let flat = iter
61-
.into_iter()
62-
.map(HeaderValue::from)
63-
.collect();
55+
let flat = iter.into_iter().map(HeaderValue::from).collect();
6456
AccessControlExposeHeaders(flat)
6557
}
6658
}
6759

6860
#[cfg(test)]
6961
mod tests {
70-
use super::*;
7162
use super::super::{test_decode, test_encode};
63+
use super::*;
7264

7365
#[test]
7466
fn iter() {
75-
let expose_headers = test_decode::<AccessControlExposeHeaders>(
76-
&["foo, bar"]
77-
).unwrap();
67+
let expose_headers = test_decode::<AccessControlExposeHeaders>(&["foo, bar"]).unwrap();
7868

7969
let as_vec = expose_headers.iter().collect::<Vec<_>>();
8070
assert_eq!(as_vec.len(), 2);
@@ -84,13 +74,15 @@ mod tests {
8474

8575
#[test]
8676
fn from_iter() {
87-
let expose: AccessControlExposeHeaders = vec![
88-
::http::header::CACHE_CONTROL,
89-
::http::header::IF_RANGE,
90-
].into_iter().collect();
77+
let expose: AccessControlExposeHeaders =
78+
vec![::http::header::CACHE_CONTROL, ::http::header::IF_RANGE]
79+
.into_iter()
80+
.collect();
9181

9282
let headers = test_encode(expose);
93-
assert_eq!(headers["access-control-expose-headers"], "cache-control, if-range");
83+
assert_eq!(
84+
headers["access-control-expose-headers"],
85+
"cache-control, if-range"
86+
);
9487
}
9588
}
96-

‎src/common/access_control_request_headers.rs‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::iter::FromIterator;
22

3-
use {HeaderName, HeaderValue};
43
use util::FlatCsv;
4+
use {HeaderName, HeaderValue};
55

66
/// `Access-Control-Request-Headers` header, part of
77
/// [CORS](http://www.w3.org/TR/cors/#access-control-request-headers-request-header)
@@ -44,12 +44,7 @@ derive_header! {
4444
impl AccessControlRequestHeaders {
4545
/// Returns an iterator over `HeaderName`s contained within.
4646
pub fn iter<'a>(&'a self) -> impl Iterator<Item = HeaderName> + 'a {
47-
self
48-
.0
49-
.iter()
50-
.filter_map(|s| {
51-
s.parse().ok()
52-
})
47+
self.0.iter().filter_map(|s| s.parse().ok())
5348
}
5449
}
5550

@@ -58,24 +53,19 @@ impl FromIterator<HeaderName> for AccessControlRequestHeaders {
5853
where
5954
I: IntoIterator<Item = HeaderName>,
6055
{
61-
let flat = iter
62-
.into_iter()
63-
.map(HeaderValue::from)
64-
.collect();
56+
let flat = iter.into_iter().map(HeaderValue::from).collect();
6557
AccessControlRequestHeaders(flat)
6658
}
6759
}
6860

6961
#[cfg(test)]
7062
mod tests {
71-
use super::*;
7263
use super::super::{test_decode, test_encode};
64+
use super::*;
7365

7466
#[test]
7567
fn iter() {
76-
let req_headers = test_decode::<AccessControlRequestHeaders>(
77-
&["foo, bar"]
78-
).unwrap();
68+
let req_headers = test_decode::<AccessControlRequestHeaders>(&["foo, bar"]).unwrap();
7969

8070
let as_vec = req_headers.iter().collect::<Vec<_>>();
8171
assert_eq!(as_vec.len(), 2);
@@ -85,13 +75,15 @@ mod tests {
8575

8676
#[test]
8777
fn from_iter() {
88-
let req_headers: AccessControlRequestHeaders = vec![
89-
::http::header::CACHE_CONTROL,
90-
::http::header::IF_RANGE,
91-
].into_iter().collect();
78+
let req_headers: AccessControlRequestHeaders =
79+
vec![::http::header::CACHE_CONTROL, ::http::header::IF_RANGE]
80+
.into_iter()
81+
.collect();
9282

9383
let headers = test_encode(req_headers);
94-
assert_eq!(headers["access-control-request-headers"], "cache-control, if-range");
84+
assert_eq!(
85+
headers["access-control-request-headers"],
86+
"cache-control, if-range"
87+
);
9588
}
9689
}
97-

‎src/common/access_control_request_method.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use http::Method;
2-
use ::{Header, HeaderName, HeaderValue};
2+
use {Header, HeaderName, HeaderValue};
33

44
/// `Access-Control-Request-Method` header, part of
55
/// [CORS](http://www.w3.org/TR/cors/#access-control-request-method-request-header)
@@ -34,10 +34,9 @@ impl Header for AccessControlRequestMethod {
3434
}
3535

3636
fn decode<'i, I: Iterator<Item = &'i HeaderValue>>(values: &mut I) -> Result<Self, ::Error> {
37-
values.next()
38-
.and_then(|value| {
39-
Method::from_bytes(value.as_bytes()).ok()
40-
})
37+
values
38+
.next()
39+
.and_then(|value| Method::from_bytes(value.as_bytes()).ok())
4140
.map(AccessControlRequestMethod)
4241
.ok_or_else(::Error::invalid)
4342
}
@@ -66,4 +65,3 @@ impl From<Method> for AccessControlRequestMethod {
6665
AccessControlRequestMethod(method)
6766
}
6867
}
69-

0 commit comments

Comments
 (0)