Skip to content

Commit 970d9ba

Browse files
authored
fix: Resolve all the nightly clippy lints (#348)
1 parent 81beee8 commit 970d9ba

File tree

7 files changed

+20
-21
lines changed

7 files changed

+20
-21
lines changed

sentry-backtrace/src/integration.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ impl Integration for ProcessStacktraceIntegration {
3434
) -> Option<Event<'static>> {
3535
for exc in &mut event.exception {
3636
if let Some(ref mut stacktrace) = exc.stacktrace {
37-
process_event_stacktrace(stacktrace, &options);
37+
process_event_stacktrace(stacktrace, options);
3838
}
3939
}
4040
for th in &mut event.threads {
4141
if let Some(ref mut stacktrace) = th.stacktrace {
42-
process_event_stacktrace(stacktrace, &options);
42+
process_event_stacktrace(stacktrace, options);
4343
}
4444
}
4545
if let Some(ref mut stacktrace) = event.stacktrace {
46-
process_event_stacktrace(stacktrace, &options);
46+
process_event_stacktrace(stacktrace, options);
4747
}
4848
Some(event)
4949
}

sentry-backtrace/src/trim.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ where
3838
.iter()
3939
.rev()
4040
.position(|frame| match frame.function {
41-
Some(ref func) => is_well_known(&func) || f(frame, stacktrace),
41+
Some(ref func) => is_well_known(func) || f(frame, stacktrace),
4242
None => false,
4343
});
4444

@@ -59,5 +59,5 @@ pub fn is_sys_function(func: &str) -> bool {
5959
fn is_well_known(func: &str) -> bool {
6060
WELL_KNOWN_BORDER_FRAMES
6161
.iter()
62-
.any(|m| function_starts_with(&func, m))
62+
.any(|m| function_starts_with(func, m))
6363
}

sentry-core/src/session.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ mod tests {
388388
assert!(session.duration.unwrap() > 0.01);
389389
assert_eq!(session.errors, 0);
390390
assert_eq!(session.attributes.release, "some-release");
391-
assert_eq!(session.init, true);
391+
assert!(session.init);
392392
} else {
393393
panic!("expected session");
394394
}
@@ -494,7 +494,7 @@ mod tests {
494494
assert_eq!(session.status, SessionStatus::Ok);
495495
assert_eq!(session.errors, 1);
496496
assert_eq!(session.attributes.release, "some-release");
497-
assert_eq!(session.init, true);
497+
assert!(session.init);
498498
} else {
499499
panic!("expected session");
500500
}
@@ -504,7 +504,7 @@ mod tests {
504504
if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() {
505505
assert_eq!(session.status, SessionStatus::Exited);
506506
assert_eq!(session.errors, 1);
507-
assert_eq!(session.init, false);
507+
assert!(!session.init);
508508
} else {
509509
panic!("expected session");
510510
}
@@ -522,7 +522,7 @@ mod tests {
522522
let mut items = envelopes[0].items();
523523
if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() {
524524
assert_eq!(session.status, SessionStatus::Abnormal);
525-
assert_eq!(session.init, true);
525+
assert!(session.init);
526526
} else {
527527
panic!("expected session");
528528
}
@@ -594,7 +594,7 @@ mod tests {
594594
if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() {
595595
assert_eq!(session.status, SessionStatus::Exited);
596596
assert_eq!(session.errors, 3);
597-
assert_eq!(session.init, false);
597+
assert!(!session.init);
598598
} else {
599599
panic!("expected session");
600600
}
@@ -635,7 +635,7 @@ mod tests {
635635
if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() {
636636
assert_eq!(session.status, SessionStatus::Ok);
637637
assert_eq!(session.errors, 1);
638-
assert_eq!(session.init, true);
638+
assert!(session.init);
639639
} else {
640640
panic!("expected session");
641641
}
@@ -655,7 +655,7 @@ mod tests {
655655
if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() {
656656
assert_eq!(session.status, SessionStatus::Exited);
657657
assert_eq!(session.errors, 1);
658-
assert_eq!(session.init, false);
658+
assert!(!session.init);
659659
} else {
660660
panic!("expected session");
661661
}

sentry-core/src/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl TestTransport {
7070
/// Fetches and clears the contained envelopes.
7171
pub fn fetch_and_clear_envelopes(&self) -> Vec<Envelope> {
7272
let mut guard = self.collected.lock().unwrap();
73-
std::mem::replace(&mut *guard, vec![])
73+
std::mem::take(&mut *guard)
7474
}
7575
}
7676

sentry-tracing/src/converters.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ impl Visit for BTreeMapRecorder {
5858

5959
/// Creates a [`Breadcrumb`] from a given [`tracing_core::Event`]
6060
pub fn breadcrumb_from_event(event: &tracing_core::Event) -> Breadcrumb {
61-
let (message, data) = extract_data(&event);
61+
let (message, data) = extract_data(event);
6262
Breadcrumb {
6363
category: Some(event.metadata().target().to_owned()),
6464
ty: "log".into(),
@@ -71,7 +71,7 @@ pub fn breadcrumb_from_event(event: &tracing_core::Event) -> Breadcrumb {
7171

7272
/// Creates an [`Event`] from a given [`tracing_core::Event`]
7373
pub fn event_from_event(event: &tracing_core::Event) -> Event<'static> {
74-
let (message, extra) = extract_data(&event);
74+
let (message, extra) = extract_data(event);
7575
Event {
7676
logger: Some(event.metadata().target().to_owned()),
7777
level: convert_tracing_level(event.metadata().level()),

sentry/src/transports/curl.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ impl CurlHttpTransport {
4343

4444
match (scheme, &http_proxy, &https_proxy) {
4545
(Scheme::Https, _, &Some(ref proxy)) => {
46-
handle.proxy(&proxy).unwrap();
46+
handle.proxy(proxy).unwrap();
4747
}
4848
(_, &Some(ref proxy), _) => {
49-
handle.proxy(&proxy).unwrap();
49+
handle.proxy(proxy).unwrap();
5050
}
5151
_ => {}
5252
}

sentry/tests/test_basic.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,8 @@ fn test_attached_stacktrace() {
168168

169169
assert_eq!(events.len(), 3);
170170

171-
let stacktraces: Vec<_> = events
171+
let stacktraces = events
172172
.into_iter()
173-
.flat_map(|ev| ev.threads.into_iter().filter_map(|thrd| thrd.stacktrace))
174-
.collect();
175-
assert_eq!(stacktraces.len(), 3);
173+
.flat_map(|ev| ev.threads.into_iter().filter_map(|thrd| thrd.stacktrace));
174+
assert_eq!(stacktraces.count(), 3);
176175
}

0 commit comments

Comments
 (0)