Fix CS (#726)

Author: cleptric

sentry-actix/src/lib.rs

@@ -225,7 +225,7 @@ where
             inner.hub.clone().unwrap_or_else(Hub::main),
         ));
         let client = hub.client();
-        let track_sessions = client.as_ref().map_or(false, |client| {
+        let track_sessions = client.as_ref().is_some_and(|client| {
             let options = client.options();
             options.auto_session_tracking
                 && options.session_mode == sentry_core::SessionMode::Request
@@ -235,7 +235,7 @@ where
         }
         let with_pii = client
             .as_ref()
-            .map_or(false, |client| client.options().send_default_pii);
+            .is_some_and(|client| client.options().send_default_pii);
 
         let sentry_req = sentry_request_from_http(&req, with_pii);
         let name = transaction_name_from_http(&req);

sentry-core/src/client.rs

@@ -189,10 +189,7 @@ impl Client {
         }
 
         if let Some(scope) = scope {
-            event = match scope.apply_to_event(event) {
-                Some(event) => event,
-                None => return None,
-            };
+            event = scope.apply_to_event(event)?;
         }
 
         for (_, integration) in self.integrations.iter() {

sentry-core/src/hub_impl.rs

@@ -90,11 +90,7 @@ impl HubImpl {
             Ok(guard) => guard,
         };
 
-        guard
-            .top()
-            .client
-            .as_ref()
-            .map_or(false, |c| c.is_enabled())
+        guard.top().client.as_ref().is_some_and(|c| c.is_enabled())
     }
 }