ref(sourcemapcache): Implement AsSelf for SourceMapCache

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 - `PortablePdbDebugSession` now returns files referenced in the Portable PDB file. ([#729](https://github.com/getsentry/symbolic/pull/729))
 - `PortablePdbDebugSession` now returns source files embedded in the Portable PDB file. ([#734](https://github.com/getsentry/symbolic/pull/734))
+- Implement `symbolic_common::AsSelf` `for SourceMapCache` ([#742](https://github.com/getsentry/symbolic/pull/742))
 
 **Breaking changes**:
 

symbolic-cabi/src/sourcemapcache.rs

@@ -7,35 +7,18 @@ use std::slice;
 use crate::utils::ForeignObject;
 use crate::SymbolicStr;
 
-use symbolic::common::AsSelf;
 use symbolic::common::ByteView;
 use symbolic::common::SelfCell;
 use symbolic::sourcemapcache::SourceLocation;
 use symbolic::sourcemapcache::{
     ScopeLookupResult, SourceMapCache, SourceMapCacheWriter, SourcePosition,
 };
 
-struct Inner<'a> {
-    cache: SourceMapCache<'a>,
-}
-
-impl<'slf, 'a: 'slf> AsSelf<'slf> for Inner<'a> {
-    type Ref = Inner<'slf>;
-
-    fn as_self(&'slf self) -> &Self::Ref {
-        self
-    }
-}
-
-pub struct OwnedSourceMapCache<'a> {
-    inner: SelfCell<ByteView<'a>, Inner<'a>>,
-}
-
 /// Represents an sourcemapcache.
 pub struct SymbolicSourceMapCache;
 
 impl ForeignObject for SymbolicSourceMapCache {
-    type RustObject = OwnedSourceMapCache<'static>;
+    type RustObject = SelfCell<ByteView<'static>, SourceMapCache<'static>>;
 }
 
 #[repr(C)]
@@ -101,12 +84,11 @@ ffi_fn! {
         let file = buf_writer.into_inner()?;
 
         let byteview = ByteView::map_file(file)?;
-        let inner = SelfCell::try_new::<symbolic::sourcemapcache::SourceMapCacheError, _>(byteview, |data| {
+        let cache = SelfCell::try_new::<symbolic::sourcemapcache::SourceMapCacheError, _>(byteview, |data| {
             let cache = SourceMapCache::parse(&*data)?;
-            Ok(Inner { cache })
+            Ok(cache)
         })?;
 
-        let cache = OwnedSourceMapCache { inner };
         Ok(SymbolicSourceMapCache::from_rust(cache))
     }
 }
@@ -181,9 +163,7 @@ ffi_fn! {
     ) -> Result<*mut SymbolicSmTokenMatch> {
         // Sentry JS events are 1-indexed, where SourcePosition is using 0-indexed locations
         let token_match = SymbolicSourceMapCache::as_rust(source_map)
-            .inner
             .get()
-            .cache
             .lookup(SourcePosition::new(line - 1, col - 1))
             .map(|sp| make_token_match(sp, context_lines))
             .unwrap_or_else(ptr::null_mut);

symbolic-sourcemapcache/Cargo.toml

@@ -15,6 +15,7 @@ edition = "2021"
 js-source-scopes = "0.3.1"
 thiserror = "1.0.31"
 sourcemap = "6.1.0"
+symbolic-common = { version = "10.2.1", path = "../symbolic-common" }
 tracing = "0.1.36"
 watto = { version = "0.1.0", features = ["writer", "strings"] }
 itertools = "0.10.3"

symbolic-sourcemapcache/src/lookup.rs

@@ -1,3 +1,4 @@
+use symbolic_common::AsSelf;
 use watto::{align_to, Pod, StringTable};
 
 use crate::{ScopeLookupResult, SourcePosition};
@@ -78,6 +79,14 @@ pub struct SourceMapCache<'data> {
     string_bytes: &'data [u8],
 }
 
+impl<'slf, 'a: 'slf> AsSelf<'slf> for SourceMapCache<'a> {
+    type Ref = SourceMapCache<'slf>;
+
+    fn as_self(&'slf self) -> &Self::Ref {
+        self
+    }
+}
+
 impl<'data> std::fmt::Debug for SourceMapCache<'data> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("SourceMapCache")