diff --git a/build.rs b/build.rs index 06ed7af835..a3598923a9 100644 --- a/build.rs +++ b/build.rs @@ -28,7 +28,7 @@ macro_rules! rerun_if_changed { }; } -include!("src/compiler-common.rs"); +include!("src/compiler_common.rs"); #[tokio::main] async fn main() -> StdResult<(), Box> { diff --git a/src/compiler.rs b/src/compiler.rs index 33d24b28ae..540a28c0ca 100644 --- a/src/compiler.rs +++ b/src/compiler.rs @@ -4,9 +4,10 @@ use rquickjs::{Context, Module, Runtime}; use tracing::trace; use zstd::bulk::Compressor; -use crate::vm::COMPRESSION_DICT; - -include!("compiler-common.rs"); +use crate::{ + compiler_common::{human_file_size, DummyLoader, DummyResolver}, + vm::COMPRESSION_DICT, +}; fn compress_module(bytes: &[u8]) -> io::Result> { let mut compressor = Compressor::with_dictionary(22, COMPRESSION_DICT)?; @@ -21,7 +22,7 @@ fn compress_module(bytes: &[u8]) -> io::Result> { } pub async fn compile_file(input_filename: &Path, output_filename: &Path) -> Result<(), String> { - let resolver: (DummyResolver,) = (DummyResolver,); + let resolver = (DummyResolver,); let loader = (DummyLoader,); let rt = Runtime::new().unwrap(); diff --git a/src/compiler-common.rs b/src/compiler_common.rs similarity index 88% rename from src/compiler-common.rs rename to src/compiler_common.rs index 6c42f84359..1556b4926f 100644 --- a/src/compiler-common.rs +++ b/src/compiler_common.rs @@ -6,7 +6,7 @@ use rquickjs::{ Ctx, }; -struct DummyLoader; +pub struct DummyLoader; impl Loader for DummyLoader { fn load(&mut self, _ctx: &Ctx<'_>, name: &str) -> rquickjs::Result { @@ -14,7 +14,7 @@ impl Loader for DummyLoader { } } -struct DummyResolver; +pub struct DummyResolver; impl Resolver for DummyResolver { fn resolve(&mut self, _ctx: &Ctx<'_>, _base: &str, name: &str) -> rquickjs::Result { @@ -22,7 +22,7 @@ impl Resolver for DummyResolver { } } -fn human_file_size(size: usize) -> String { +pub fn human_file_size(size: usize) -> String { let fsize = size as f64; let i = if size == 0 { 0 diff --git a/src/main.rs b/src/main.rs index eec9bc0387..7e68b1099c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,6 +8,7 @@ mod buffer; mod bytearray_buffer; mod child_process; mod compiler; +mod compiler_common; mod console; mod crypto; mod encoding;