Skip to content

Commit db4d891

Browse files
pyfischpyfisch
committed
style(headers): Break lines with over 100 characters
1 parent 66d54d0 commit db4d891

11 files changed

+92
-35
lines changed

‎src/header/common/accept.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ header! {
4848
Some(HeaderField(vec![
4949
QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![]), Quality(500)),
5050
qitem(Mime(TopLevel::Text, SubLevel::Html, vec![])),
51-
QualityItem::new(Mime(TopLevel::Text, SubLevel::Ext("x-dvi".to_string()), vec![]), Quality(800)),
51+
QualityItem::new(
52+
Mime(TopLevel::Text, SubLevel::Ext("x-dvi".to_string()), vec![]),
53+
Quality(800)),
5254
qitem(Mime(TopLevel::Text, SubLevel::Ext("x-c".to_string()), vec![])),
5355
])));
5456
// Custom tests
@@ -62,7 +64,9 @@ header! {
6264
test4,
6365
vec![b"text/plain; charset=utf-8; q=0.5"],
6466
Some(Accept(vec![
65-
QualityItem::new(Mime(TopLevel::Text, SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]), Quality(500)),
67+
QualityItem::new(Mime(TopLevel::Text,
68+
SubLevel::Plain, vec![(Attr::Charset, Value::Utf8)]),
69+
Quality(500)),
6670
])));
6771
}
6872
}

‎src/header/common/allow.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,5 @@ header! {
4747
}
4848
}
4949

50-
bench_header!(bench, Allow, { vec![b"OPTIONS,GET,PUT,POST,DELETE,HEAD,TRACE,CONNECT,PATCH,fOObAr".to_vec()] });
50+
bench_header!(bench,
51+
Allow, { vec![b"OPTIONS,GET,PUT,POST,DELETE,HEAD,TRACE,CONNECT,PATCH,fOObAr".to_vec()] });

‎src/header/common/authorization.rs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,15 +167,19 @@ mod tests {
167167

168168
#[test]
169169
fn test_raw_auth_parse() {
170-
let header: Authorization<String> = Header::parse_header(&[b"foo bar baz".to_vec()]).unwrap();
170+
let header: Authorization<String> = Header::parse_header(
171+
&[b"foo bar baz".to_vec()]).unwrap();
171172
assert_eq!(header.0, "foo bar baz");
172173
}
173174

174175
#[test]
175176
fn test_basic_auth() {
176177
let mut headers = Headers::new();
177-
headers.set(Authorization(Basic { username: "Aladdin".to_string(), password: Some("open sesame".to_string()) }));
178-
assert_eq!(headers.to_string(), "Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==\r\n".to_string());
178+
headers.set(Authorization(
179+
Basic { username: "Aladdin".to_string(), password: Some("open sesame".to_string()) }));
180+
assert_eq!(
181+
headers.to_string(),
182+
"Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==\r\n".to_string());
179183
}
180184

181185
#[test]
@@ -187,19 +191,21 @@ mod tests {
187191

188192
#[test]
189193
fn test_basic_auth_parse() {
190-
let auth: Authorization<Basic> = Header::parse_header(&[b"Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==".to_vec()]).unwrap();
194+
let auth: Authorization<Basic> = Header::parse_header(
195+
&[b"Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==".to_vec()]).unwrap();
191196
assert_eq!(auth.0.username, "Aladdin");
192197
assert_eq!(auth.0.password, Some("open sesame".to_string()));
193198
}
194199

195200
#[test]
196201
fn test_basic_auth_parse_no_password() {
197-
let auth: Authorization<Basic> = Header::parse_header(&[b"Basic QWxhZGRpbjo=".to_vec()]).unwrap();
202+
let auth: Authorization<Basic> = Header::parse_header(
203+
&[b"Basic QWxhZGRpbjo=".to_vec()]).unwrap();
198204
assert_eq!(auth.0.username, "Aladdin");
199205
assert_eq!(auth.0.password, Some("".to_string()));
200206
}
201207

202208
}
203209

204210
bench_header!(raw, Authorization<String>, { vec![b"foo bar baz".to_vec()] });
205-
bench_header!(basic, Authorization<Basic>, { vec![b"Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==".to_vec()] });
211+
bench_header!(basic, Authorization<Basic>, { vec![b"Basic QWxhZGRpbjpuIHNlc2FtZQ==".to_vec()] });

‎src/header/common/cache_control.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ mod tests {
168168
#[test]
169169
fn test_parse_extension() {
170170
let cache = Header::parse_header(&[b"foo, bar=baz".to_vec()]);
171-
assert_eq!(cache, Some(CacheControl(vec![CacheDirective::Extension("foo".to_string(), None),
172-
CacheDirective::Extension("bar".to_string(), Some("baz".to_string()))])))
171+
assert_eq!(cache, Some(CacheControl(vec![
172+
CacheDirective::Extension("foo".to_string(), None),
173+
CacheDirective::Extension("bar".to_string(), Some("baz".to_string()))])))
173174
}
174175

175176
#[test]
@@ -179,4 +180,5 @@ mod tests {
179180
}
180181
}
181182

182-
bench_header!(normal, CacheControl, { vec![b"no-cache, private".to_vec(), b"max-age=100".to_vec()] });
183+
bench_header!(normal,
184+
CacheControl, { vec![b"no-cache, private".to_vec(), b"max-age=100".to_vec()] });

‎src/header/common/content_type.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ header! {
2727
// FIXME: Should be b"text/html; charset=ISO-8859-4" but mime crate lowercases
2828
// the whole value so parsing and formatting the value gives a different result
2929
vec![b"text/html; charset=iso-8859-4"],
30-
Some(HeaderField(Mime(TopLevel::Text, SubLevel::Html, vec![(Attr::Charset, Value::Ext("iso-8859-4".to_string()))]))));
30+
Some(HeaderField(Mime(
31+
TopLevel::Text,
32+
SubLevel::Html,
33+
vec![(Attr::Charset, Value::Ext("iso-8859-4".to_string()))]))));
3134
}
3235
}
3336

‎src/header/common/cookie.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ fn test_fmt() {
9898
let mut cookie_pair = CookiePair::new("foo".to_string(), "bar".to_string());
9999
cookie_pair.httponly = true;
100100
cookie_pair.path = Some("/p".to_string());
101-
let cookie_header = Cookie(vec![cookie_pair, CookiePair::new("baz".to_string(), "quux".to_string())]);
101+
let cookie_header = Cookie(vec![
102+
cookie_pair,
103+
CookiePair::new("baz".to_string(),"quux".to_string())]);
102104
let mut headers = Headers::new();
103105
headers.set(cookie_header);
104106

‎src/header/common/etag.rs

Lines changed: 42 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,21 +26,49 @@ header! {
2626

2727
test_etag {
2828
// From the RFC
29-
test_header!(test1, vec![b"\"xyzzy\""], Some(ETag(EntityTag::new(false, "xyzzy".to_string()))));
30-
test_header!(test2, vec![b"W/\"xyzzy\""], Some(ETag(EntityTag::new(true, "xyzzy".to_string()))));
31-
test_header!(test3, vec![b"\"\""], Some(ETag(EntityTag::new(false, "".to_string()))));
29+
test_header!(test1,
30+
vec![b"\"xyzzy\""],
31+
Some(ETag(EntityTag::new(false, "xyzzy".to_string()))));
32+
test_header!(test2,
33+
vec![b"W/\"xyzzy\""],
34+
Some(ETag(EntityTag::new(true, "xyzzy".to_string()))));
35+
test_header!(test3,
36+
vec![b"\"\""],
37+
Some(ETag(EntityTag::new(false, "".to_string()))));
3238
// Own tests
33-
test_header!(test4, vec![b"\"foobar\""], Some(ETag(EntityTag::new(false, "foobar".to_string()))));
34-
test_header!(test5, vec![b"\"\""], Some(ETag(EntityTag::new(false, "".to_string()))));
35-
test_header!(test6, vec![b"W/\"weak-etag\""], Some(ETag(EntityTag::new(true, "weak-etag".to_string()))));
36-
test_header!(test7, vec![b"W/\"\x65\x62\""], Some(ETag(EntityTag::new(true, "\u{0065}\u{0062}".to_string()))));
37-
test_header!(test8, vec![b"W/\"\""], Some(ETag(EntityTag::new(true, "".to_string()))));
38-
test_header!(test9, vec![b"no-dquotes"], None::<ETag>);
39-
test_header!(test10, vec![b"w/\"the-first-w-is-case-sensitive\""], None::<ETag>);
40-
test_header!(test11, vec![b""], None::<ETag>);
41-
test_header!(test12, vec![b"\"unmatched-dquotes1"], None::<ETag>);
42-
test_header!(test13, vec![b"unmatched-dquotes2\""], None::<ETag>);
43-
test_header!(test14, vec![b"matched-\"dquotes\""], None::<ETag>);
39+
test_header!(test4,
40+
vec![b"\"foobar\""],
41+
Some(ETag(EntityTag::new(false, "foobar".to_string()))));
42+
test_header!(test5,
43+
vec![b"\"\""],
44+
Some(ETag(EntityTag::new(false, "".to_string()))));
45+
test_header!(test6,
46+
vec![b"W/\"weak-etag\""],
47+
Some(ETag(EntityTag::new(true, "weak-etag".to_string()))));
48+
test_header!(test7,
49+
vec![b"W/\"\x65\x62\""],
50+
Some(ETag(EntityTag::new(true, "\u{0065}\u{0062}".to_string()))));
51+
test_header!(test8,
52+
vec![b"W/\"\""],
53+
Some(ETag(EntityTag::new(true, "".to_string()))));
54+
test_header!(test9,
55+
vec![b"no-dquotes"],
56+
None::<ETag>);
57+
test_header!(test10,
58+
vec![b"w/\"the-first-w-is-case-sensitive\""],
59+
None::<ETag>);
60+
test_header!(test11,
61+
vec![b""],
62+
None::<ETag>);
63+
test_header!(test12,
64+
vec![b"\"unmatched-dquotes1"],
65+
None::<ETag>);
66+
test_header!(test13,
67+
vec![b"unmatched-dquotes2\""],
68+
None::<ETag>);
69+
test_header!(test14,
70+
vec![b"matched-\"dquotes\""],
71+
None::<ETag>);
4472
}
4573
}
4674

‎src/header/common/last_modified.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use header::HttpDate;
22

33
header! {
4-
#[doc="`Last-Modified` header, defined in [RFC7232](http://tools.ietf.org/html/rfc7232#section-2.2)"]
4+
#[doc="`Last-Modified` header, defined in"]
5+
#[doc="[RFC7232](http://tools.ietf.org/html/rfc7232#section-2.2)"]
56
#[doc=""]
67
#[doc="The `Last-Modified` header field in a response provides a timestamp"]
78
#[doc="indicating the date and time at which the origin server believes the"]

‎src/header/common/mod.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,16 @@ macro_rules! test_header {
124124
let value = HeaderField::parse_header(&a[..]);
125125
let result = format!("{}", value.unwrap());
126126
let expected = String::from_utf8(raw[0].to_vec()).unwrap();
127-
let result_cmp: Vec<String> = result.to_ascii_lowercase().split(' ').map(|x| x.to_string()).collect();
128-
let expected_cmp: Vec<String> = expected.to_ascii_lowercase().split(' ').map(|x| x.to_string()).collect();
127+
let result_cmp: Vec<String> = result
128+
.to_ascii_lowercase()
129+
.split(' ')
130+
.map(|x| x.to_string())
131+
.collect();
132+
let expected_cmp: Vec<String> = expected
133+
.to_ascii_lowercase()
134+
.split(' ')
135+
.map(|x| x.to_string())
136+
.collect();
129137
assert_eq!(result_cmp.concat(), expected_cmp.concat());
130138
}
131139
};
@@ -259,7 +267,8 @@ macro_rules! header {
259267
fn fmt_header(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
260268
match *self {
261269
$id::Any => f.write_str("*"),
262-
$id::Items(ref fields) => $crate::header::parsing::fmt_comma_delimited(f, &fields[..])
270+
$id::Items(ref fields) => $crate::header::parsing::fmt_comma_delimited(
271+
f, &fields[..])
263272
}
264273
}
265274
}

‎src/header/common/set_cookie.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,9 @@ fn test_fmt() {
134134
let mut headers = Headers::new();
135135
headers.set(cookies);
136136

137-
assert_eq!(&headers.to_string()[..], "Set-Cookie: foo=bar; HttpOnly; Path=/p\r\nSet-Cookie: baz=quux; Path=/\r\n");
137+
assert_eq!(
138+
&headers.to_string()[..],
139+
"Set-Cookie: foo=bar; HttpOnly; Path=/p\r\nSet-Cookie: baz=quux; Path=/\r\n");
138140
}
139141

140142
#[test]

‎src/header/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ impl Clone for Box<HeaderFormat + Send + Sync> {
9494

9595
#[inline]
9696
fn header_name<T: Header>() -> &'static str {
97-
let name = <T as Header>::header_name();
98-
name
97+
<T as Header>::header_name()
9998
}
10099

101100
/// A map of header fields on requests and responses.

0 commit comments

Comments
 (0)