Skip to content

Commit 47e5fd6

Browse files
rustyjbr
authored andcommitted
Fix clippy warnings
1 parent 52cc143 commit 47e5fd6

File tree

10 files changed

+27
-27
lines changed

10 files changed

+27
-27
lines changed

src/cache/clear_site_data/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ mod test {
269269
entries.apply_header(&mut res);
270270

271271
let entries = ClearSiteData::from_headers(res)?.unwrap();
272-
assert_eq!(entries.wildcard(), true);
272+
assert!(entries.wildcard());
273273
let mut entries = entries.iter();
274274
assert_eq!(entries.next().unwrap(), &ClearDirective::Cache);
275275
Ok(())
@@ -281,15 +281,15 @@ mod test {
281281
res.insert_header("clear-site-data", r#""cookies""#);
282282

283283
let entries = ClearSiteData::from_headers(res)?.unwrap();
284-
assert_eq!(entries.wildcard(), false);
284+
assert!(!entries.wildcard());
285285
let mut entries = entries.iter();
286286
assert_eq!(entries.next().unwrap(), &ClearDirective::Cookies);
287287

288288
let mut res = Response::new(200);
289289
res.insert_header("clear-site-data", r#""*""#);
290290

291291
let entries = ClearSiteData::from_headers(res)?.unwrap();
292-
assert_eq!(entries.wildcard(), true);
292+
assert!(entries.wildcard());
293293
let mut entries = entries.iter();
294294
assert_eq!(entries.next(), None);
295295
Ok(())

src/conditional/if_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ mod test {
265265
entries.apply_header(&mut res);
266266

267267
let entries = IfMatch::from_headers(res)?.unwrap();
268-
assert_eq!(entries.wildcard(), true);
268+
assert!(entries.wildcard());
269269
let mut entries = entries.iter();
270270
assert_eq!(
271271
entries.next().unwrap(),

src/conditional/if_none_match.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ mod test {
271271
entries.apply_header(&mut res);
272272

273273
let entries = IfNoneMatch::from_headers(res)?.unwrap();
274-
assert_eq!(entries.wildcard(), true);
274+
assert!(entries.wildcard());
275275
let mut entries = entries.iter();
276276
assert_eq!(
277277
entries.next().unwrap(),

src/conditional/vary.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ mod test {
266266
entries.apply_header(&mut res);
267267

268268
let entries = Vary::from_headers(res)?.unwrap();
269-
assert_eq!(entries.wildcard(), true);
269+
assert!(entries.wildcard());
270270
let mut entries = entries.iter();
271271
assert_eq!(entries.next().unwrap(), "User-Agent");
272272
Ok(())

src/content/accept.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ impl Accept {
9191
}
9292
}
9393

94-
Ok(Some(Self { entries, wildcard }))
94+
Ok(Some(Self { wildcard, entries }))
9595
}
9696

9797
/// Push a directive into the list of entries.

src/content/accept_encoding.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ impl AcceptEncoding {
8383
}
8484
}
8585

86-
Ok(Some(Self { entries, wildcard }))
86+
Ok(Some(Self { wildcard, entries }))
8787
}
8888

8989
/// Push a directive into the list of entries.
@@ -161,7 +161,7 @@ impl Header for AcceptEncoding {
161161
fn header_value(&self) -> HeaderValue {
162162
let mut output = String::new();
163163
for (n, directive) in self.entries.iter().enumerate() {
164-
let directive: HeaderValue = directive.clone().into();
164+
let directive: HeaderValue = (*directive).into();
165165
match n {
166166
0 => write!(output, "{}", directive).unwrap(),
167167
_ => write!(output, ", {}", directive).unwrap(),

src/security/timing_allow_origin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ mod test {
311311
origins.apply_header(&mut headers);
312312

313313
let origins = TimingAllowOrigin::from_headers(headers)?.unwrap();
314-
assert_eq!(origins.wildcard(), true);
314+
assert!(origins.wildcard());
315315
let origin = origins.iter().next().unwrap();
316316
assert_eq!(origin, &Url::parse("https://example.com")?);
317317
Ok(())

src/status_code.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ impl StatusCode {
425425
/// If this returns `true` it indicates that the request was received,
426426
/// continuing process.
427427
pub fn is_informational(&self) -> bool {
428-
let num: u16 = self.clone().into();
428+
let num: u16 = (*self).into();
429429
(100..200).contains(&num)
430430
}
431431

@@ -434,7 +434,7 @@ impl StatusCode {
434434
/// If this returns `true` it indicates that the request was successfully
435435
/// received, understood, and accepted.
436436
pub fn is_success(&self) -> bool {
437-
let num: u16 = self.clone().into();
437+
let num: u16 = (*self).into();
438438
(200..300).contains(&num)
439439
}
440440

@@ -443,7 +443,7 @@ impl StatusCode {
443443
/// If this returns `true` it indicates that further action needs to be
444444
/// taken in order to complete the request.
445445
pub fn is_redirection(&self) -> bool {
446-
let num: u16 = self.clone().into();
446+
let num: u16 = (*self).into();
447447
(300..400).contains(&num)
448448
}
449449

@@ -452,7 +452,7 @@ impl StatusCode {
452452
/// If this returns `true` it indicates that the request contains bad syntax
453453
/// or cannot be fulfilled.
454454
pub fn is_client_error(&self) -> bool {
455-
let num: u16 = self.clone().into();
455+
let num: u16 = (*self).into();
456456
(400..500).contains(&num)
457457
}
458458

@@ -461,7 +461,7 @@ impl StatusCode {
461461
/// If this returns `true` it indicates that the server failed to fulfill an
462462
/// apparently valid request.
463463
pub fn is_server_error(&self) -> bool {
464-
let num: u16 = self.clone().into();
464+
let num: u16 = (*self).into();
465465
(500..600).contains(&num)
466466
}
467467

src/trace/trace_context.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ use crate::Status;
3030
///
3131
/// assert_eq!(context.trace_id(), trace_id.unwrap());
3232
/// assert_eq!(context.parent_id(), parent_id.ok());
33-
/// assert_eq!(context.sampled(), true);
33+
/// assert!(context.sampled());
3434
/// #
3535
/// # Ok(()) }
3636
/// ```
@@ -56,7 +56,7 @@ impl TraceContext {
5656
/// let context = TraceContext::new();
5757
///
5858
/// assert_eq!(context.parent_id(), None);
59-
/// assert_eq!(context.sampled(), true);
59+
/// assert!(context.sampled());
6060
/// ```
6161
pub fn new() -> Self {
6262
Self {
@@ -95,7 +95,7 @@ impl TraceContext {
9595
///
9696
/// assert_eq!(context.trace_id(), trace_id.unwrap());
9797
/// assert_eq!(context.parent_id(), parent_id.ok());
98-
/// assert_eq!(context.sampled(), true);
98+
/// assert!(context.sampled());
9999
/// #
100100
/// # Ok(()) }
101101
/// ```
@@ -169,7 +169,7 @@ impl TraceContext {
169169
/// let mut res = Response::new(200);
170170
/// res.insert_header("traceparent", "00-00000000000000000000000000000001-0000000000000002-01");
171171
/// let context = TraceContext::from_headers(&res)?.unwrap();
172-
/// assert_eq!(context.sampled(), true);
172+
/// assert!(context.sampled());
173173
/// #
174174
/// # Ok(()) }
175175
/// ```
@@ -185,9 +185,9 @@ impl TraceContext {
185185
/// use http_types::trace::TraceContext;
186186
///
187187
/// let mut context = TraceContext::new();
188-
/// assert_eq!(context.sampled(), true);
188+
/// assert!(context.sampled());
189189
/// context.set_sampled(false);
190-
/// assert_eq!(context.sampled(), false);
190+
/// assert!(!context.sampled());
191191
/// ```
192192
pub fn set_sampled(&mut self, sampled: bool) {
193193
let x = sampled as u8;
@@ -229,7 +229,7 @@ mod test {
229229
assert_eq!(context.trace_id(), 1);
230230
assert_eq!(context.parent_id().unwrap(), 3735928559);
231231
assert_eq!(context.flags, 0);
232-
assert_eq!(context.sampled(), false);
232+
assert!(!context.sampled());
233233
Ok(())
234234
}
235235

@@ -239,15 +239,15 @@ mod test {
239239
assert_eq!(context.version(), 0);
240240
assert_eq!(context.parent_id(), None);
241241
assert_eq!(context.flags, 1);
242-
assert_eq!(context.sampled(), true);
242+
assert!(context.sampled());
243243
}
244244

245245
#[test]
246246
fn not_sampled() -> crate::Result<()> {
247247
let mut headers = crate::headers::Headers::new();
248248
headers.insert(TRACEPARENT, "00-01-02-00");
249249
let context = TraceContext::from_headers(&mut headers)?.unwrap();
250-
assert_eq!(context.sampled(), false);
250+
assert!(!context.sampled());
251251
Ok(())
252252
}
253253

@@ -256,7 +256,7 @@ mod test {
256256
let mut headers = crate::headers::Headers::new();
257257
headers.insert(TRACEPARENT, "00-01-02-01");
258258
let context = TraceContext::from_headers(&mut headers)?.unwrap();
259-
assert_eq!(context.sampled(), true);
259+
assert!(context.sampled());
260260
Ok(())
261261
}
262262
}

src/transfer/te.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ impl TE {
8181
}
8282
}
8383

84-
Ok(Some(Self { entries, wildcard }))
84+
Ok(Some(Self { wildcard, entries }))
8585
}
8686

8787
/// Push a directive into the list of entries.
@@ -159,7 +159,7 @@ impl Header for TE {
159159
fn header_value(&self) -> HeaderValue {
160160
let mut output = String::new();
161161
for (n, directive) in self.entries.iter().enumerate() {
162-
let directive: HeaderValue = directive.clone().into();
162+
let directive: HeaderValue = (*directive).into();
163163
match n {
164164
0 => write!(output, "{}", directive).unwrap(),
165165
_ => write!(output, ", {}", directive).unwrap(),

0 commit comments

Comments
 (0)