Revert "try: cached source"

This reverts commit 045714a.

Author: SyMind

Cargo.lock

@@ -37,7 +37,7 @@ rustc-hash = "2.1.0"
 dashmap = "6.1.0"
 memchr = "2.7.4"
 itertools = "0.13"
-ouroboros = "0.18.4"
+
 
 codspeed-criterion-compat = { version = "2.7.2", default-features = false, optional = true }
 static_assertions = "1.1.0"

Cargo.toml

@@ -49,81 +49,58 @@ use crate::{
 ///   "Hello World\nconsole.log('test');\nconsole.log('test2');\nHello2\n"
 /// );
 /// ```
-
-pub struct CachedSource<T: 'static> {
-  inner: CachedSourceInner<T>,
-}
-
-#[ouroboros::self_referencing]
-pub struct CachedSourceInner<T: 'static> {
+pub struct CachedSource<T> {
   inner: Arc<T>,
-  #[not_covariant]
-  #[borrows(inner)]
-  cached_rope: Arc<OnceLock<Rope<'this>>>,
   cached_hash: Arc<OnceLock<u64>>,
   cached_maps:
     Arc<DashMap<MapOptions, Option<SourceMap>, BuildHasherDefault<FxHasher>>>,
 }
 
-impl<T: Source> CachedSource<T> {
-  fn get_rope(&self) -> &Rope<'_> {
-    self
-      .inner
-      .with(|cache| cache.cached_rope.get_or_init(|| cache.inner.rope()))
-  }
-}
-
 impl<T> CachedSource<T> {
   /// Create a [CachedSource] with the original [Source].
   pub fn new(inner: T) -> Self {
     Self {
-      inner: CachedSourceInner::new(
-        Arc::new(inner),
-        |_| Default::default(),
-        Default::default(),
-        Default::default(),
-      ),
+      inner: Arc::new(inner),
+      cached_hash: Default::default(),
+      cached_maps: Default::default(),
     }
   }
 
   /// Get the original [Source].
   pub fn original(&self) -> &T {
-    self.inner.borrow_inner()
+    &self.inner
   }
 }
 
 impl<T: Source + Hash + PartialEq + Eq + 'static> Source for CachedSource<T> {
   fn source(&self) -> Cow<str> {
-    Cow::Owned(self.get_rope().to_string())
+    self.inner.source()
   }
 
   fn rope(&self) -> Rope<'_> {
-    self.get_rope().clone()
+    self.inner.rope()
   }
 
   fn buffer(&self) -> Cow<[u8]> {
-    self.inner.borrow_inner().buffer()
+    self.inner.buffer()
   }
 
   fn size(&self) -> usize {
     self.source().len()
   }
 
   fn map(&self, options: &MapOptions) -> Option<SourceMap> {
-    if let Some(map) = self.inner.borrow_cached_maps().get(options) {
+    if let Some(map) = self.cached_maps.get(options) {
       map.clone()
     } else {
-      let map = self.inner.borrow_inner().map(options);
-      self
-        .inner
-        .borrow_cached_maps()
-        .insert(options.clone(), map.clone());
+      let map = self.inner.map(options);
+      self.cached_maps.insert(options.clone(), map.clone());
       map
     }
   }
 
   fn to_writer(&self, writer: &mut dyn std::io::Write) -> std::io::Result<()> {
-    self.inner.borrow_inner().to_writer(writer)
+    self.inner.to_writer(writer)
   }
 }
 
@@ -137,7 +114,7 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> StreamChunks
     on_source: crate::helpers::OnSource<'_, 'a>,
     on_name: crate::helpers::OnName<'_, 'a>,
   ) -> crate::helpers::GeneratedInfo {
-    let cached_map = self.inner.borrow_cached_maps().entry(options.clone());
+    let cached_map = self.cached_maps.entry(options.clone());
     match cached_map {
       Entry::Occupied(entry) => {
         let source = self.rope();
@@ -161,7 +138,7 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> StreamChunks
       }
       Entry::Vacant(entry) => {
         let (generated_info, map) = stream_and_get_source_and_map(
-          self.inner.borrow_inner() as &T,
+          &self.inner as &T,
           options,
           on_chunk,
           on_source,
@@ -176,21 +153,19 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> StreamChunks
 
 impl<T> Clone for CachedSource<T> {
   fn clone(&self) -> Self {
-    // Self {
-    //   inner: self.inner.clone(),
-    //   cached_rope: Default::default(),
-    //   cached_hash: self.cached_hash.clone(),
-    //   cached_maps: self.cached_maps.clone(),
-    // }
-    todo!()
+    Self {
+      inner: self.inner.clone(),
+      cached_hash: self.cached_hash.clone(),
+      cached_maps: self.cached_maps.clone(),
+    }
   }
 }
 
 impl<T: Source + Hash + PartialEq + Eq + 'static> Hash for CachedSource<T> {
   fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-    (self.inner.borrow_cached_hash().get_or_init(|| {
+    (self.cached_hash.get_or_init(|| {
       let mut hasher = FxHasher::default();
-      self.original().hash(&mut hasher);
+      self.inner.hash(&mut hasher);
       hasher.finish()
     }))
     .hash(state);
@@ -199,7 +174,7 @@ impl<T: Source + Hash + PartialEq + Eq + 'static> Hash for CachedSource<T> {
 
 impl<T: PartialEq> PartialEq for CachedSource<T> {
   fn eq(&self, other: &Self) -> bool {
-    self.inner.borrow_inner() == other.inner.borrow_inner()
+    self.inner == other.inner
   }
 }
 
@@ -211,12 +186,9 @@ impl<T: std::fmt::Debug> std::fmt::Debug for CachedSource<T> {
     f: &mut std::fmt::Formatter<'_>,
   ) -> Result<(), std::fmt::Error> {
     f.debug_struct("CachedSource")
-      .field("inner", self.inner.borrow_inner().as_ref())
-      .field("cached_hash", self.inner.borrow_cached_hash().as_ref())
-      .field(
-        "cached_maps",
-        &(!self.inner.borrow_cached_maps().is_empty()),
-      )
+      .field("inner", self.inner.as_ref())
+      .field("cached_hash", self.cached_hash.as_ref())
+      .field("cached_maps", &(!self.cached_maps.is_empty()))
       .finish()
   }
 }
@@ -264,12 +236,7 @@ mod tests {
     source.map(&map_options);
 
     assert_eq!(
-      *clone
-        .inner
-        .borrow_cached_maps()
-        .get(&map_options)
-        .unwrap()
-        .value(),
+      *clone.cached_maps.get(&map_options).unwrap().value(),
       source.map(&map_options)
     );
   }