Skip to content

Commit 7dcee4b

Browse files
committed
cargo fmt
1 parent 06415fb commit 7dcee4b

File tree

6 files changed

+48
-21
lines changed

6 files changed

+48
-21
lines changed

src/conditional/etag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ impl ETag {
9696

9797
/// Convert an ETag to a String.
9898
pub fn to_string(&self) -> String {
99-
match self {
99+
match self {
100100
Self::Strong(s) => format!(r#""{}""#, s),
101101
Self::Weak(s) => format!(r#"W/"{}""#, s),
102102
}

src/conditional/if_match.rs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ pub struct IfMatch {
4444
impl IfMatch {
4545
/// Create a new instance of `IfMatch`.
4646
pub fn new() -> Self {
47-
Self { entries: vec![], wildcard: false }
47+
Self {
48+
entries: vec![],
49+
wildcard: false,
50+
}
4851
}
4952

5053
/// Create a new instance from headers.
@@ -68,7 +71,6 @@ impl IfMatch {
6871
}
6972

7073
Ok(Some(Self { entries, wildcard }))
71-
7274
}
7375

7476
/// Sets the `If-Match` header.
@@ -255,8 +257,14 @@ mod test {
255257

256258
let entries = IfMatch::from_headers(res)?.unwrap();
257259
let mut entries = entries.iter();
258-
assert_eq!(entries.next().unwrap(), &ETag::new("0xcafebeef".to_string()));
259-
assert_eq!(entries.next().unwrap(), &ETag::new("0xbeefcafe".to_string()));
260+
assert_eq!(
261+
entries.next().unwrap(),
262+
&ETag::new("0xcafebeef".to_string())
263+
);
264+
assert_eq!(
265+
entries.next().unwrap(),
266+
&ETag::new("0xbeefcafe".to_string())
267+
);
260268
Ok(())
261269
}
262270

@@ -272,7 +280,10 @@ mod test {
272280
let entries = IfMatch::from_headers(res)?.unwrap();
273281
assert_eq!(entries.wildcard(), true);
274282
let mut entries = entries.iter();
275-
assert_eq!(entries.next().unwrap(), &ETag::new("0xcafebeef".to_string()));
283+
assert_eq!(
284+
entries.next().unwrap(),
285+
&ETag::new("0xcafebeef".to_string())
286+
);
276287
Ok(())
277288
}
278289
}

src/conditional/if_none_match.rs

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
//! This is used to update caches or to prevent uploading a new resource when
44
//! one already exists.
55
6-
use crate::headers::{HeaderName, HeaderValue, Headers, ToHeaderValues, IF_NONE_MATCH};
76
use crate::conditional::ETag;
7+
use crate::headers::{HeaderName, HeaderValue, Headers, ToHeaderValues, IF_NONE_MATCH};
88

99
use std::fmt::{self, Debug, Write};
1010
use std::iter::Iterator;
@@ -50,7 +50,10 @@ pub struct IfNoneMatch {
5050
impl IfNoneMatch {
5151
/// Create a new instance of `IfNoneMatch`.
5252
pub fn new() -> Self {
53-
Self { entries: vec![], wildcard: false }
53+
Self {
54+
entries: vec![],
55+
wildcard: false,
56+
}
5457
}
5558

5659
/// Create a new instance from headers.
@@ -260,8 +263,14 @@ mod test {
260263

261264
let entries = IfNoneMatch::from_headers(res)?.unwrap();
262265
let mut entries = entries.iter();
263-
assert_eq!(entries.next().unwrap(), &ETag::new("0xcafebeef".to_string()));
264-
assert_eq!(entries.next().unwrap(), &ETag::new("0xbeefcafe".to_string()));
266+
assert_eq!(
267+
entries.next().unwrap(),
268+
&ETag::new("0xcafebeef".to_string())
269+
);
270+
assert_eq!(
271+
entries.next().unwrap(),
272+
&ETag::new("0xbeefcafe".to_string())
273+
);
265274
Ok(())
266275
}
267276

@@ -277,7 +286,10 @@ mod test {
277286
let entries = IfNoneMatch::from_headers(res)?.unwrap();
278287
assert_eq!(entries.wildcard(), true);
279288
let mut entries = entries.iter();
280-
assert_eq!(entries.next().unwrap(), &ETag::new("0xcafebeef".to_string()));
289+
assert_eq!(
290+
entries.next().unwrap(),
291+
&ETag::new("0xcafebeef".to_string())
292+
);
281293
Ok(())
282294
}
283295
}

src/conditional/vary.rs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ pub struct Vary {
4444
impl Vary {
4545
/// Create a new instance of `Vary`.
4646
pub fn new() -> Self {
47-
Self { entries: vec![], wildcard: false }
47+
Self {
48+
entries: vec![],
49+
wildcard: false,
50+
}
4851
}
4952

5053
/// Create a new instance from headers.
@@ -95,7 +98,10 @@ impl Vary {
9598
pub fn value(&self) -> HeaderValue {
9699
let mut output = String::new();
97100
for (n, name) in self.entries.iter().enumerate() {
98-
let directive: HeaderValue = name.as_str().parse().expect("Could not convert a HeaderName into a HeaderValue");
101+
let directive: HeaderValue = name
102+
.as_str()
103+
.parse()
104+
.expect("Could not convert a HeaderName into a HeaderValue");
99105
match n {
100106
0 => write!(output, "{}", directive).unwrap(),
101107
_ => write!(output, ", {}", directive).unwrap(),
@@ -114,10 +120,7 @@ impl Vary {
114120
}
115121

116122
/// Push a directive into the list of entries.
117-
pub fn push(
118-
&mut self,
119-
directive: impl Into<HeaderName>,
120-
) -> crate::Result<()> {
123+
pub fn push(&mut self, directive: impl Into<HeaderName>) -> crate::Result<()> {
121124
self.entries.push(directive.into());
122125
Ok(())
123126
}

src/security/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod timing_allow_origin;
2222

2323
pub use csp::{ContentSecurityPolicy, ReportTo, ReportToEndpoint, Source};
2424
#[doc(inline)]
25-
pub use timing_allow_origin::{TimingAllowOrigin};
25+
pub use timing_allow_origin::TimingAllowOrigin;
2626

2727
/// Apply a set of default protections.
2828
///

src/security/timing_allow_origin.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,10 @@ pub struct TimingAllowOrigin {
6666
impl TimingAllowOrigin {
6767
/// Create a new instance of `AllowOrigin`.
6868
pub fn new() -> Self {
69-
Self { origins: vec![], wildcard: false, }
69+
Self {
70+
origins: vec![],
71+
wildcard: false,
72+
}
7073
}
7174

7275
/// Create an instance of `AllowOrigin` from a `Headers` instance.
@@ -328,6 +331,4 @@ mod test {
328331
assert_eq!(origin, &Url::parse("https://example.com")?);
329332
Ok(())
330333
}
331-
332-
333334
}

0 commit comments

Comments
 (0)