perf

Author: SyMind

benches/bench.rs

@@ -18,7 +18,7 @@ use rspack_sources::{
 
 use bench_complex_replace_source::benchmark_complex_replace_source;
 use bench_source_map::{
- benchmark_parse_source_map_from_json, benchmark_source_map_clone,
+ benchmark_parse_source_map_from_json, benchmark_source_map_as_borrowed,
  benchmark_stringify_source_map_to_json,
 };
 
@@ -253,7 +253,7 @@ fn bench_rspack_sources(criterion: &mut Criterion) {
  benchmark_parse_source_map_from_json,
  );
 
- group.bench_function("source_map_clone", benchmark_source_map_clone);
+ group.bench_function("source_map_as_borrowed", benchmark_source_map_as_borrowed);
 
  group.bench_function(
  "stringify_source_map_to_json",

benches/bench_source_map.rs

@@ -19,10 +19,10 @@ pub fn benchmark_parse_source_map_from_json(b: &mut Bencher) {
  })
 }
 
-pub fn benchmark_source_map_clone(b: &mut Bencher) {
+pub fn benchmark_source_map_as_borrowed(b: &mut Bencher) {
  let source = SourceMap::from_json(ANTD_MIN_JS_MAP).unwrap();
  b.iter(|| {
- let _ = black_box(source.clone());
+ let _ = black_box(source.as_borrowed());
  })
 }
 

src/cached_source.rs

@@ -119,19 +119,17 @@ impl Source for CachedSource {
  fn map(&self, options: &MapOptions) -> Option<SourceMap> {
  if options.columns {
  self.0.with_dependent(|owner, dependent| {
- dependent.cached_colomns_map.get_or_init(|| {
- let map = owner.inner.map(options);
- unsafe { std::mem::transmute::<Option<SourceMap>, Option<SourceMap<'static>>>(map) }
- })
+ dependent
+ .cached_colomns_map
+ .get_or_init(|| owner.inner.map(options).map(|m| m.into_owned()))
  .as_ref()
  .map(|m| m.as_borrowed())
  })
  } else {
  self.0.with_dependent(|owner, dependent| {
- dependent.cached_line_only_map.get_or_init(|| {
- let map = owner.inner.map(options);
- unsafe { std::mem::transmute::<Option<SourceMap>, Option<SourceMap<'static>>>(map) }
- })
+ dependent
+ .cached_line_only_map
+ .get_or_init(|| owner.inner.map(options).map(|m| m.into_owned()))
  .as_ref()
  .map(|m| m.as_borrowed())
  })

src/lib.rs

@@ -12,6 +12,7 @@ mod raw_source;
 mod replace_source;
 mod rope;
 mod source;
+mod source_map;
 mod source_map_source;
 mod with_indices;
 
@@ -24,8 +25,8 @@ pub use replace_source::{ReplaceSource, ReplacementEnforce};
 pub use rope::Rope;
 pub use source::{
  BoxSource, MapOptions, Mapping, OriginalLocation, Source, SourceExt,
- SourceMap,
 };
+pub use source_map::SourceMap;
 pub use source_map_source::{
  SourceMapSource, SourceMapSourceOptions, WithoutOriginalOptions,
 };