fix v1

Author: tobias-wilfert

relay-config/src/config.rs

@@ -2247,7 +2247,7 @@ impl Config {
         }
 
         let file_name = path.file_name().and_then(|f| f.to_str())?;
-        let new_file_name = format!("{}.{}", file_name, partition_id);
+        let new_file_name = format!("{file_name}.{partition_id}");
         path.set_file_name(new_file_name);
 
         Some(path)

relay-event-normalization/src/normalize/contexts.rs

@@ -145,7 +145,7 @@ fn normalize_runtime_context(runtime: &mut RuntimeContext) {
     // The equivalent calculation is done in `sentry` in `src/sentry/interfaces/contexts.py`.
     if runtime.runtime.value().is_none() {
         if let (Some(name), Some(version)) = (runtime.name.value(), runtime.version.value()) {
-            runtime.runtime = Annotated::from(format!("{} {}", name, version));
+            runtime.runtime = Annotated::from(format!("{name} {version}"));
         }
     }
 }
@@ -270,7 +270,7 @@ fn compute_os_context(os: &mut OsContext) {
     // The equivalent calculation is done in `sentry` in `src/sentry/interfaces/contexts.py`.
     if os.os.value().is_none() {
         if let (Some(name), Some(version)) = (os.name.value(), os.version.value()) {
-            os.os = Annotated::from(format!("{} {}", name, version));
+            os.os = Annotated::from(format!("{name} {version}"));
         }
     }
 }
@@ -280,7 +280,7 @@ fn normalize_browser_context(browser: &mut BrowserContext) {
     // The equivalent calculation is done in `sentry` in `src/sentry/interfaces/contexts.py`.
     if browser.browser.value().is_none() {
         if let (Some(name), Some(version)) = (browser.name.value(), browser.version.value()) {
-            browser.browser = Annotated::from(format!("{} {}", name, version));
+            browser.browser = Annotated::from(format!("{name} {version}"));
         }
     }
 }

relay-event-normalization/src/normalize/span/description/mod.rs

@@ -1415,15 +1415,14 @@ mod tests {
         for (url, allowed_hosts, expected) in examples {
             let json = format!(
                 r#"{{
-                    "description": "POST {}",
+                    "description": "POST {url}",
                     "span_id": "bd2eb23da2beb459",
                     "start_timestamp": 1597976393.4619668,
                     "timestamp": 1597976393.4718769,
                     "trace_id": "ff62a8b040f340bda5d830223def1d81",
                     "op": "http.client"
         }}
             "#,
-                url,
             );
 
             let mut span = Annotated::<Span>::from_json(&json).unwrap();
@@ -1433,7 +1432,7 @@ mod tests {
 
             assert_eq!(
                 scrubbed.0.as_deref(),
-                Some(format!("POST {}", expected).as_str()),
+                Some(format!("POST {expected}").as_str()),
                 "Could not match {url}"
             );
         }

relay-event-normalization/src/timestamp.rs

@@ -53,17 +53,15 @@ impl Processor for TimestampProcessor {
         if let Some(start_timestamp) = span.start_timestamp.value() {
             if start_timestamp.into_inner().timestamp_millis() < 0 {
                 meta.add_error(Error::invalid(format!(
-                    "start_timestamp is too stale: {}",
-                    start_timestamp
+                    "start_timestamp is too stale: {start_timestamp}"
                 )));
                 return Err(ProcessingAction::DeleteValueHard);
             }
         }
         if let Some(end_timestamp) = span.timestamp.value() {
             if end_timestamp.into_inner().timestamp_millis() < 0 {
                 meta.add_error(Error::invalid(format!(
-                    "timestamp is too stale: {}",
-                    end_timestamp
+                    "timestamp is too stale: {end_timestamp}"
                 )));
                 return Err(ProcessingAction::DeleteValueHard);
             }
@@ -81,8 +79,7 @@ impl Processor for TimestampProcessor {
         if let Some(timestamp) = breadcrumb.timestamp.value() {
             if timestamp.into_inner().timestamp_millis() < 0 {
                 meta.add_error(Error::invalid(format!(
-                    "timestamp is too stale: {}",
-                    timestamp
+                    "timestamp is too stale: {timestamp}"
                 )));
                 return Err(ProcessingAction::DeleteValueHard);
             }

relay-filter/src/transaction_name.rs

@@ -247,8 +247,7 @@ mod tests {
                 assert_eq!(
                     filter_result,
                     Ok(()),
-                    "Event filtered for event_type={} although filter should have not matched",
-                    event_type
+                    "Event filtered for event_type={event_type} although filter should have not matched"
                 )
             }
         }

relay-log/src/setup.rs

@@ -126,7 +126,7 @@ impl Level {
 
 impl Display for Level {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", format!("{:?}", self).to_lowercase())
+        write!(f, "{}", format!("{self:?}").to_lowercase())
     }
 }
 

relay-profiling/src/sample/v2.rs

@@ -221,10 +221,10 @@ mod tests {
     fn test_roundtrip() {
         let first_payload = include_bytes!("../../tests/fixtures/sample/v2/valid.json");
         let first_parse = parse(first_payload);
-        assert!(first_parse.is_ok(), "{:#?}", first_parse);
+        assert!(first_parse.is_ok(), "{first_parse:#?}");
         let second_payload = serde_json::to_vec(&first_parse.unwrap()).unwrap();
         let second_parse = parse(&second_payload[..]);
-        assert!(second_parse.is_ok(), "{:#?}", second_parse);
+        assert!(second_parse.is_ok(), "{second_parse:#?}");
     }
 
     #[test]

relay-profiling/src/utils.rs

@@ -31,16 +31,13 @@ where
         AnyType::String(s) => s.parse::<T>().map_err(serde::de::Error::custom),
         AnyType::Number(n) => Ok(n),
         AnyType::Bool(v) => Err(serde::de::Error::custom(format!(
-            "unsupported value: {:?}",
-            v
+            "unsupported value: {v:?}"
         ))),
         AnyType::Array(v) => Err(serde::de::Error::custom(format!(
-            "unsupported value: {:?}",
-            v
+            "unsupported value: {v:?}"
         ))),
         AnyType::Object(v) => Err(serde::de::Error::custom(format!(
-            "unsupported value: {:?}",
-            v
+            "unsupported value: {v:?}"
         ))),
         AnyType::Null => Err(serde::de::Error::custom("unsupported null value")),
     }

relay-prosperoconv/build.rs

@@ -40,7 +40,7 @@ fn main() {
             "clone",
             "[email protected]:getsentry/tempest.git",
             &temp_dir_str,
-            &format!("--revision={}", version),
+            &format!("--revision={version}"),
             "--depth=1",
         ])
         .status()
@@ -52,7 +52,7 @@ fn main() {
                 "clone",
                 "https://github.com/getsentry/tempest.git",
                 &temp_dir_str,
-                &format!("--revision={}", version),
+                &format!("--revision={version}"),
                 "--depth=1",
             ])
             .status()

relay-quotas/src/redis.rs

@@ -493,7 +493,7 @@ mod tests {
                 scope_id: None,
                 limit: Some(quota_limit),
                 window: Some(600),
-                reason_code: Some(ReasonCode::new(format!("ns: {:?}", namespace))),
+                reason_code: Some(ReasonCode::new(format!("ns: {namespace:?}"))),
                 namespace,
             }
         };