diff --git a/sentry-backtrace/src/integration.rs b/sentry-backtrace/src/integration.rs index 4a3b6077b..0a01d0f40 100644 --- a/sentry-backtrace/src/integration.rs +++ b/sentry-backtrace/src/integration.rs @@ -34,16 +34,16 @@ impl Integration for ProcessStacktraceIntegration { ) -> Option> { for exc in &mut event.exception { if let Some(ref mut stacktrace) = exc.stacktrace { - process_event_stacktrace(stacktrace, &options); + process_event_stacktrace(stacktrace, options); } } for th in &mut event.threads { if let Some(ref mut stacktrace) = th.stacktrace { - process_event_stacktrace(stacktrace, &options); + process_event_stacktrace(stacktrace, options); } } if let Some(ref mut stacktrace) = event.stacktrace { - process_event_stacktrace(stacktrace, &options); + process_event_stacktrace(stacktrace, options); } Some(event) } diff --git a/sentry-backtrace/src/trim.rs b/sentry-backtrace/src/trim.rs index 1a2308fe1..844eb85c0 100644 --- a/sentry-backtrace/src/trim.rs +++ b/sentry-backtrace/src/trim.rs @@ -38,7 +38,7 @@ where .iter() .rev() .position(|frame| match frame.function { - Some(ref func) => is_well_known(&func) || f(frame, stacktrace), + Some(ref func) => is_well_known(func) || f(frame, stacktrace), None => false, }); @@ -59,5 +59,5 @@ pub fn is_sys_function(func: &str) -> bool { fn is_well_known(func: &str) -> bool { WELL_KNOWN_BORDER_FRAMES .iter() - .any(|m| function_starts_with(&func, m)) + .any(|m| function_starts_with(func, m)) } diff --git a/sentry-core/src/session.rs b/sentry-core/src/session.rs index 2023960de..2289f9141 100644 --- a/sentry-core/src/session.rs +++ b/sentry-core/src/session.rs @@ -388,7 +388,7 @@ mod tests { assert!(session.duration.unwrap() > 0.01); assert_eq!(session.errors, 0); assert_eq!(session.attributes.release, "some-release"); - assert_eq!(session.init, true); + assert!(session.init); } else { panic!("expected session"); } @@ -494,7 +494,7 @@ mod tests { assert_eq!(session.status, SessionStatus::Ok); assert_eq!(session.errors, 1); assert_eq!(session.attributes.release, "some-release"); - assert_eq!(session.init, true); + assert!(session.init); } else { panic!("expected session"); } @@ -504,7 +504,7 @@ mod tests { if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() { assert_eq!(session.status, SessionStatus::Exited); assert_eq!(session.errors, 1); - assert_eq!(session.init, false); + assert!(!session.init); } else { panic!("expected session"); } @@ -522,7 +522,7 @@ mod tests { let mut items = envelopes[0].items(); if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() { assert_eq!(session.status, SessionStatus::Abnormal); - assert_eq!(session.init, true); + assert!(session.init); } else { panic!("expected session"); } @@ -594,7 +594,7 @@ mod tests { if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() { assert_eq!(session.status, SessionStatus::Exited); assert_eq!(session.errors, 3); - assert_eq!(session.init, false); + assert!(!session.init); } else { panic!("expected session"); } @@ -635,7 +635,7 @@ mod tests { if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() { assert_eq!(session.status, SessionStatus::Ok); assert_eq!(session.errors, 1); - assert_eq!(session.init, true); + assert!(session.init); } else { panic!("expected session"); } @@ -655,7 +655,7 @@ mod tests { if let Some(EnvelopeItem::SessionUpdate(session)) = items.next() { assert_eq!(session.status, SessionStatus::Exited); assert_eq!(session.errors, 1); - assert_eq!(session.init, false); + assert!(!session.init); } else { panic!("expected session"); } diff --git a/sentry-core/src/test.rs b/sentry-core/src/test.rs index 739fe2e62..6a8b115d6 100644 --- a/sentry-core/src/test.rs +++ b/sentry-core/src/test.rs @@ -70,7 +70,7 @@ impl TestTransport { /// Fetches and clears the contained envelopes. pub fn fetch_and_clear_envelopes(&self) -> Vec { let mut guard = self.collected.lock().unwrap(); - std::mem::replace(&mut *guard, vec![]) + std::mem::take(&mut *guard) } } diff --git a/sentry-tracing/src/converters.rs b/sentry-tracing/src/converters.rs index 9bd98ada0..2a708c2f2 100644 --- a/sentry-tracing/src/converters.rs +++ b/sentry-tracing/src/converters.rs @@ -58,7 +58,7 @@ impl Visit for BTreeMapRecorder { /// Creates a [`Breadcrumb`] from a given [`tracing_core::Event`] pub fn breadcrumb_from_event(event: &tracing_core::Event) -> Breadcrumb { - let (message, data) = extract_data(&event); + let (message, data) = extract_data(event); Breadcrumb { category: Some(event.metadata().target().to_owned()), ty: "log".into(), @@ -71,7 +71,7 @@ pub fn breadcrumb_from_event(event: &tracing_core::Event) -> Breadcrumb { /// Creates an [`Event`] from a given [`tracing_core::Event`] pub fn event_from_event(event: &tracing_core::Event) -> Event<'static> { - let (message, extra) = extract_data(&event); + let (message, extra) = extract_data(event); Event { logger: Some(event.metadata().target().to_owned()), level: convert_tracing_level(event.metadata().level()), diff --git a/sentry/src/transports/curl.rs b/sentry/src/transports/curl.rs index 8a7468e17..2acc2162d 100644 --- a/sentry/src/transports/curl.rs +++ b/sentry/src/transports/curl.rs @@ -43,10 +43,10 @@ impl CurlHttpTransport { match (scheme, &http_proxy, &https_proxy) { (Scheme::Https, _, &Some(ref proxy)) => { - handle.proxy(&proxy).unwrap(); + handle.proxy(proxy).unwrap(); } (_, &Some(ref proxy), _) => { - handle.proxy(&proxy).unwrap(); + handle.proxy(proxy).unwrap(); } _ => {} } diff --git a/sentry/tests/test_basic.rs b/sentry/tests/test_basic.rs index 54bedc930..ae9a64de1 100644 --- a/sentry/tests/test_basic.rs +++ b/sentry/tests/test_basic.rs @@ -168,9 +168,8 @@ fn test_attached_stacktrace() { assert_eq!(events.len(), 3); - let stacktraces: Vec<_> = events + let stacktraces = events .into_iter() - .flat_map(|ev| ev.threads.into_iter().filter_map(|thrd| thrd.stacktrace)) - .collect(); - assert_eq!(stacktraces.len(), 3); + .flat_map(|ev| ev.threads.into_iter().filter_map(|thrd| thrd.stacktrace)); + assert_eq!(stacktraces.count(), 3); }