refactor: RawBufferSource (#173)

Author: SyMind

Cargo.lock

@@ -42,7 +42,6 @@ itertools = "0.13"
 codspeed-criterion-compat = { version = "2.7.2", default-features = false, optional = true }
 static_assertions = "1.1.0"
 simd-json = "0.14.3"
-ouroboros = "0.18.5"
 
 [dev-dependencies]
 twox-hash = "2.1.0"

Cargo.toml

@@ -4,8 +4,6 @@ use std::{
   sync::OnceLock,
 };
 
-use ouroboros::self_referencing;
-
 use crate::{
   helpers::{
     get_generated_source_info, stream_chunks_of_raw_source, OnChunk, OnName,
@@ -364,59 +362,57 @@ impl StreamChunks for RawStringSource {
 /// assert_eq!(s.map(&MapOptions::default()), None);
 /// assert_eq!(s.size(), 16);
 /// ```
-#[self_referencing]
 pub struct RawBufferSource {
   value: Vec<u8>,
-  #[borrows(value)]
-  #[not_covariant]
-  value_as_string: OnceLock<Cow<'this, str>>,
+  value_as_string: OnceLock<Option<String>>,
 }
 
 impl RawBufferSource {
+  #[allow(unsafe_code)]
   fn get_or_init_value_as_string(&self) -> &str {
-    self.with(|fields| {
-      fields
-        .value_as_string
-        .get_or_init(|| String::from_utf8_lossy(fields.value))
-    })
+    self
+      .value_as_string
+      .get_or_init(|| match String::from_utf8_lossy(&self.value) {
+        Cow::Owned(s) => Some(s),
+        Cow::Borrowed(_) => None,
+      })
+      .as_deref()
+      .unwrap_or_else(|| unsafe { std::str::from_utf8_unchecked(&self.value) })
   }
 }
 
 impl Clone for RawBufferSource {
   fn clone(&self) -> Self {
-    RawBufferSourceBuilder {
-      value: self.borrow_value().clone(),
-      value_as_string_builder: |_: &Vec<u8>| Default::default(),
+    Self {
+      value: self.value.clone(),
+      value_as_string: Default::default(),
     }
-    .build()
   }
 }
 
 impl PartialEq for RawBufferSource {
   fn eq(&self, other: &Self) -> bool {
-    self.borrow_value() == other.borrow_value()
+    self.value == other.value
   }
 }
 
 impl Eq for RawBufferSource {}
 
 impl From<Vec<u8>> for RawBufferSource {
   fn from(value: Vec<u8>) -> Self {
-    RawBufferSourceBuilder {
+    Self {
       value,
-      value_as_string_builder: |_: &Vec<u8>| Default::default(),
+      value_as_string: Default::default(),
     }
-    .build()
   }
 }
 
 impl From<&[u8]> for RawBufferSource {
   fn from(value: &[u8]) -> Self {
-    RawBufferSourceBuilder {
+    Self {
       value: value.to_vec(),
-      value_as_string_builder: |_: &Vec<u8>| Default::default(),
+      value_as_string: Default::default(),
     }
-    .build()
   }
 }
 
@@ -430,19 +426,19 @@ impl Source for RawBufferSource {
   }
 
   fn buffer(&self) -> Cow<[u8]> {
-    Cow::Borrowed(self.borrow_value())
+    Cow::Borrowed(&self.value)
   }
 
   fn size(&self) -> usize {
-    self.borrow_value().len()
+    self.value.len()
   }
 
   fn map(&self, _: &MapOptions) -> Option<SourceMap> {
     None
   }
 
   fn to_writer(&self, writer: &mut dyn std::io::Write) -> std::io::Result<()> {
-    writer.write_all(self.borrow_value())
+    writer.write_all(&self.value)
   }
 }
 
@@ -456,7 +452,7 @@ impl std::fmt::Debug for RawBufferSource {
     write!(
       f,
       "{indent_str}RawBufferSource::from({:?}).boxed()",
-      self.borrow_value()
+      &self.value
     )
   }
 }
@@ -499,7 +495,7 @@ mod tests {
   // Fix https://github.com/web-infra-dev/rspack/issues/6793
   #[test]
   fn fix_rspack_issue_6793() {
-    let source1 = RawSource::from("hello\n\n".to_string());
+    let source1 = RawStringSource::from_static("hello\n\n");
     let source1 = ReplaceSource::new(source1);
     let source2 = OriginalSource::new("world".to_string(), "world.txt");
     let concat = ConcatSource::new([source1.boxed(), source2.boxed()]);