diff --git a/Cargo.lock b/Cargo.lock index e85dcfe..5f6fd8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1571,6 +1571,8 @@ dependencies = [ "lune-utils", "mlua", "mlua-luau-scheduler 0.0.1", + "serde", + "serde_json", "tokio", ] @@ -1694,8 +1696,6 @@ dependencies = [ "once_cell", "path-clean", "pathdiff", - "serde", - "serde_json", "tokio", ] diff --git a/crates/lune-std/Cargo.toml b/crates/lune-std/Cargo.toml index 6e69db2..179446d 100644 --- a/crates/lune-std/Cargo.toml +++ b/crates/lune-std/Cargo.toml @@ -39,6 +39,8 @@ task = ["dep:lune-std-task"] mlua = { version = "0.9.7", features = ["luau"] } mlua-luau-scheduler = "0.0.1" +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" tokio = { version = "1", default-features = false, features = ["fs", "sync"] } lune-utils = { version = "0.1.0", path = "../lune-utils" } diff --git a/crates/lune-std/src/globals/require/alias.rs b/crates/lune-std/src/globals/require/alias.rs index 70e7aaf..924056b 100644 --- a/crates/lune-std/src/globals/require/alias.rs +++ b/crates/lune-std/src/globals/require/alias.rs @@ -1,9 +1,8 @@ use mlua::prelude::*; -use lune_utils::{ - path::{clean_path_and_make_absolute, diff_path, get_current_dir}, - LuauRc, -}; +use lune_utils::path::{clean_path_and_make_absolute, diff_path, get_current_dir}; + +use crate::luaurc::LuauRc; use super::context::*; diff --git a/crates/lune-std/src/lib.rs b/crates/lune-std/src/lib.rs index 4f64427..a29bef0 100644 --- a/crates/lune-std/src/lib.rs +++ b/crates/lune-std/src/lib.rs @@ -5,6 +5,7 @@ use mlua::prelude::*; mod global; mod globals; mod library; +mod luaurc; pub use self::global::LuneStandardGlobal; pub use self::globals::version::set_global_version; diff --git a/crates/lune-utils/src/luaurc.rs b/crates/lune-std/src/luaurc.rs similarity index 98% rename from crates/lune-utils/src/luaurc.rs rename to crates/lune-std/src/luaurc.rs index 415cc2d..0eada59 100644 --- a/crates/lune-utils/src/luaurc.rs +++ b/crates/lune-std/src/luaurc.rs @@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; use tokio::fs::read; -use crate::path::{clean_path, clean_path_and_make_absolute}; +use lune_utils::path::{clean_path, clean_path_and_make_absolute}; const LUAURC_FILE: &str = ".luaurc"; diff --git a/crates/lune-utils/Cargo.toml b/crates/lune-utils/Cargo.toml index 38f3fb4..dd39731 100644 --- a/crates/lune-utils/Cargo.toml +++ b/crates/lune-utils/Cargo.toml @@ -20,6 +20,3 @@ dunce = "1.0" once_cell = "1.17" path-clean = "1.0" pathdiff = "0.2" - -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" diff --git a/crates/lune-utils/src/lib.rs b/crates/lune-utils/src/lib.rs index 3357fe1..52743a3 100644 --- a/crates/lune-utils/src/lib.rs +++ b/crates/lune-utils/src/lib.rs @@ -1,12 +1,10 @@ #![allow(clippy::cargo_common_metadata)] -mod luaurc; mod table_builder; mod version_string; pub mod fmt; pub mod path; -pub use self::luaurc::LuauRc; pub use self::table_builder::TableBuilder; pub use self::version_string::get_version_string;