diff --git a/Cargo.lock b/Cargo.lock index afe3e8d..44ce2c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,6 @@ dependencies = [ "git2", "lazy-regex", "pollster", - "rayon", "rbx_asset", "rbx_binary", "rbx_dom_weak", @@ -1358,6 +1357,7 @@ version = "0.1.0" dependencies = [ "futures", "lazy-regex", + "rayon", "rbx_dom_weak", "rbx_xml", "tokio", diff --git a/Cargo.toml b/Cargo.toml index bcf00cb..2849d7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,6 @@ futures = "0.3.30" git2 = "0.18.1" lazy-regex = "3.1.0" pollster = "0.3.0" -rayon = "1.8.0" rbx_asset = { path = "rbx_asset" } rbx_binary = "0.7.4" rbx_dom_weak = "2.7.0" diff --git a/rox_compiler/Cargo.toml b/rox_compiler/Cargo.toml index dca7762..4b57ee8 100644 --- a/rox_compiler/Cargo.toml +++ b/rox_compiler/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" [dependencies] futures = "0.3.30" lazy-regex = "3.1.0" +rayon = "1.8.0" rbx_dom_weak = "2.7.0" rbx_xml = "0.13.3" tokio = { version = "1.35.1", features = ["fs"] } diff --git a/rox_compiler/src/compile.rs b/rox_compiler/src/compile.rs index f7275ef..55afcee 100644 --- a/rox_compiler/src/compile.rs +++ b/rox_compiler/src/compile.rs @@ -1,7 +1,8 @@ use std::path::PathBuf; +use futures::{StreamExt, TryStreamExt}; use tokio::io::AsyncReadExt; -use crate::types::{DecompileStyle,PropertiesOverride}; +use crate::types::{Style,PropertiesOverride}; use crate::common::sanitize; //holy smokes what am I doing lmao @@ -235,7 +236,7 @@ enum CompileNodeError{ FileName(std::ffi::OsString), ExtensionNotSupportedInStyle{ extension:String, - style:Option, + style:Option