chore: cargo +nightly clippy --fix (#833)

Author: lcian

sentry-core/src/performance.rs

@@ -313,7 +313,7 @@ impl TransactionContext {
 
         // And set our key
         let existing_value = custom.insert(key, value);
-        std::mem::swap(&mut self.custom, &mut Some(custom));
+        self.custom = Some(custom);
         existing_value
     }
 

sentry-opentelemetry/src/converters.rs

@@ -18,7 +18,7 @@ pub(crate) fn convert_span_status(status: &opentelemetry::trace::Status) -> Span
 }
 
 pub(crate) fn convert_span_kind(kind: opentelemetry::trace::SpanKind) -> Value {
-    format!("{:?}", kind).to_lowercase().into()
+    format!("{kind:?}").to_lowercase().into()
 }
 
 pub(crate) fn convert_value(value: opentelemetry::Value) -> Value {

sentry-opentelemetry/tests/captures_transaction.rs

@@ -37,6 +37,6 @@ fn test_captures_transaction() {
         sentry::protocol::EnvelopeItem::Transaction(tx) => {
             assert_eq!(tx.name.as_deref(), Some("root_span"));
         }
-        unexpected => panic!("Expected transaction, but got {:#?}", unexpected),
+        unexpected => panic!("Expected transaction, but got {unexpected:#?}"),
     }
 }

sentry-opentelemetry/tests/captures_transaction_with_nested_spans.rs

@@ -67,6 +67,6 @@ fn test_captures_transaction_with_nested_spans() {
             assert_eq!(grandchild_span.parent_span_id, Some(child_span.span_id));
             assert_eq!(child_span.parent_span_id, Some(tx_span_id));
         }
-        unexpected => panic!("Expected transaction, but got {:#?}", unexpected),
+        unexpected => panic!("Expected transaction, but got {unexpected:#?}"),
     }
 }

sentry-opentelemetry/tests/creates_distributed_trace.rs

@@ -63,14 +63,14 @@ fn test_creates_distributed_trace() {
     for envelope in &envelopes {
         let tx = match envelope.items().next().unwrap() {
             sentry::protocol::EnvelopeItem::Transaction(tx) => tx.clone(),
-            unexpected => panic!("Expected transaction, but got {:#?}", unexpected),
+            unexpected => panic!("Expected transaction, but got {unexpected:#?}"),
         };
 
         // Determine which service this transaction belongs to based on name
         match tx.name.as_deref() {
             Some("first_service") => first_tx = Some(tx),
             Some("second_service") => second_tx = Some(tx),
-            name => panic!("Unexpected transaction name: {:?}", name),
+            name => panic!("Unexpected transaction name: {name:?}"),
         }
     }
 

sentry-tracing/src/converters.rs

@@ -77,15 +77,15 @@ where
                     TransactionOrSpan::Span(span) => {
                         for (key, value) in span.data().iter() {
                             if key != "message" {
-                                let key = format!("{}:{}", name, key);
+                                let key = format!("{name}:{key}");
                                 visitor.json_values.insert(key, value.clone());
                             }
                         }
                     }
                     TransactionOrSpan::Transaction(transaction) => {
                         for (key, value) in transaction.data().iter() {
                             if key != "message" {
-                                let key = format!("{}:{}", name, key);
+                                let key = format!("{name}:{key}");
                                 visitor.json_values.insert(key, value.clone());
                             }
                         }

sentry-tracing/tests/breadcrumbs.rs

@@ -12,7 +12,7 @@ fn breadcrumbs_should_capture_span_fields() {
     let event = data.first().expect("should have 1 event");
     let event = match event.items().next().unwrap() {
         sentry::protocol::EnvelopeItem::Event(event) => event,
-        unexpected => panic!("Expected event, but got {:#?}", unexpected),
+        unexpected => panic!("Expected event, but got {unexpected:#?}"),
     };
 
     assert_eq!(event.breadcrumbs.len(), 1);

sentry-tracing/tests/smoke.rs

@@ -16,21 +16,21 @@ fn should_instrument_function_with_event() {
     let event = data.first().expect("should have 1 event");
     let event = match event.items().next().unwrap() {
         sentry::protocol::EnvelopeItem::Event(event) => event,
-        unexpected => panic!("Expected event, but got {:#?}", unexpected),
+        unexpected => panic!("Expected event, but got {unexpected:#?}"),
     };
 
     //Validate transaction is created
     let trace = match event.contexts.get("trace").expect("to get 'trace' context") {
         sentry::protocol::Context::Trace(trace) => trace,
-        unexpected => panic!("Expected trace context but got {:?}", unexpected),
+        unexpected => panic!("Expected trace context but got {unexpected:?}"),
     };
     assert_eq!(trace.op.as_deref().unwrap(), "function_with_tags");
 
     //Confirm transaction values
     let transaction = data.get(1).expect("should have 1 transaction");
     let transaction = match transaction.items().next().unwrap() {
         sentry::protocol::EnvelopeItem::Transaction(transaction) => transaction,
-        unexpected => panic!("Expected transaction, but got {:#?}", unexpected),
+        unexpected => panic!("Expected transaction, but got {unexpected:#?}"),
     };
     assert_eq!(transaction.tags.len(), 1);
     assert_eq!(trace.data.len(), 2);

sentry-types/src/protocol/v7.rs

@@ -1370,7 +1370,7 @@ impl fmt::Display for SpanId {
 
 impl fmt::Debug for SpanId {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "SpanId({})", self)
+        write!(fmt, "SpanId({self})")
     }
 }
 
@@ -1423,7 +1423,7 @@ impl fmt::Display for TraceId {
 
 impl fmt::Debug for TraceId {
     fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "TraceId({})", self)
+        write!(fmt, "TraceId({self})")
     }
 }
 
@@ -2320,8 +2320,7 @@ impl<'de> Deserialize<'de> for LogAttribute {
                     }
                     _ => {
                         return Err(de::Error::custom(format!(
-                        "expected type to be 'string' | 'integer' | 'double' | 'boolean', found {}",
-                        type_str
+                        "expected type to be 'string' | 'integer' | 'double' | 'boolean', found {type_str}"
                     )))
                     }
                 }