From 1847eca6b69263502da8173a5582ad909e973637 Mon Sep 17 00:00:00 2001 From: Wilson Lin Date: Wed, 22 Jul 2020 17:45:47 +1000 Subject: [PATCH] Fix type errors --- src/proc/mod.rs | 4 ++-- src/unit/script.rs | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/proc/mod.rs b/src/proc/mod.rs index 2cc4fbb..40c0785 100644 --- a/src/proc/mod.rs +++ b/src/proc/mod.rs @@ -341,10 +341,10 @@ impl<'d> Processor<'d> { // If minified result is actually longer than source, then write source instead. // NOTE: We still need to write source as previous iterations may have shifted code down. if js.len() >= src.len() { - js = &self[src]; + js = &self.code[src.start..src.end]; }; let write_end = write_next + js.len(); - self.code[write_next..write_end].copy_from_slice(js.as_bytes()); + self.code[write_next..write_end].copy_from_slice(js); let next_start = results.get(i + 1).map_or(self.write_next, |r| r.src.start); self.code.copy_within(src.end..next_start, write_end); write_next = write_end + (next_start - src.end); diff --git a/src/unit/script.rs b/src/unit/script.rs index 9fd1abf..d4784ae 100644 --- a/src/unit/script.rs +++ b/src/unit/script.rs @@ -39,8 +39,7 @@ pub fn process_script(proc: &mut Processor, cfg: &Cfg) -> ProcessingResult<()> { let (wg, results) = proc.new_script_section(); let src = start.written_range(proc); // TODO Optimise: Avoid copying to new Vec. - let src = Arc::new(proc[src].to_vec()); - esbuild_rs::transform(src, TRANSFORM_OPTIONS.clone(), move |result| { + esbuild_rs::transform(Arc::new(proc[src].to_vec()), TRANSFORM_OPTIONS.clone(), move |result| { results.lock().unwrap().push(JsMinSection { src, result,