chore: rearrange switch guard function

Author: saiintbrisson

sentry-core/src/hub.rs

@@ -4,7 +4,7 @@
 
 use std::sync::{Arc, RwLock};
 
-use crate::hub_impl::SwitchGuard;
+// use crate::hub_impl::SwitchGuard;
 use crate::protocol::{Event, Level, SessionStatus};
 use crate::types::Uuid;
 use crate::{Integration, IntoBreadcrumbs, Scope, ScopeGuard};
@@ -243,10 +243,4 @@ impl Hub {
             })
         }}
     }
-
-    #[inline(always)]
-    /// Consumes self to create switch guard, that can be used to modify current hub in thread local storage
-    pub fn into_switch_guard(self: Arc<Hub>) -> SwitchGuard {
-        crate::hub_impl::SwitchGuard::new(self)
-    }
 }

sentry-core/src/hub_impl.rs

@@ -21,15 +21,17 @@ thread_local! {
     );
 }
 
-///Hub switch guard
-///
-///Used to temporarily swap active hub in thread local storage.
+/// A Hub switch guard used to temporarily swap
+/// active hub in thread local storage.
 pub struct SwitchGuard {
     inner: Option<(Arc<Hub>, bool)>,
 }
 
 impl SwitchGuard {
-    pub(crate) fn new(mut hub: Arc<Hub>) -> Self {
+    /// Swaps the current thread's Hub by the one provided
+    /// and returns a guard that, when dropped, replaces it
+    /// to the previous one.
+    pub fn new(mut hub: Arc<Hub>) -> Self {
         let inner = THREAD_HUB.with(|(thread_hub, is_process_hub)| {
             // SAFETY: `thread_hub` will always be a valid thread local hub,
             // by definition not shared between threads.

sentry-core/src/lib.rs

@@ -130,7 +130,6 @@ pub use crate::clientoptions::{BeforeCallback, ClientOptions, SessionMode};
 pub use crate::error::{capture_error, event_from_error, parse_type_from_debug};
 pub use crate::futures::{SentryFuture, SentryFutureExt};
 pub use crate::hub::Hub;
-pub use crate::hub_impl::SwitchGuard as HubSwitchGuard;
 pub use crate::integration::Integration;
 pub use crate::intodsn::IntoDsn;
 pub use crate::performance::*;
@@ -150,8 +149,9 @@ pub mod metrics;
 mod session;
 #[cfg(all(feature = "client", feature = "metrics"))]
 mod units;
+
 #[cfg(feature = "client")]
-pub use crate::client::Client;
+pub use crate::{client::Client, hub_impl::SwitchGuard as HubSwitchGuard};
 
 // test utilities
 #[cfg(feature = "test")]

sentry-tracing/src/layer.rs

@@ -292,7 +292,7 @@ where
 
         let mut extensions = span.extensions_mut();
         if let Some(data) = extensions.get_mut::<SentrySpanData>() {
-            data.hub_switch_guard = Some(data.hub.clone().into_switch_guard());
+            data.hub_switch_guard = Some(sentry_core::HubSwitchGuard::new(data.hub.clone()));
             data.hub.configure_scope(|scope| {
                 scope.set_span(Some(data.sentry_span.clone()));
             })
@@ -311,7 +311,7 @@ where
             data.hub.configure_scope(|scope| {
                 scope.set_span(data.parent_sentry_span.clone());
             });
-            data.hub_switch_guard = None;
+            data.hub_switch_guard.take();
         }
     }