From dc4b492ea0d89a7fe10e091e9fec2e31d5cac8f3 Mon Sep 17 00:00:00 2001 From: Kevin Deng Date: Fri, 29 Aug 2025 16:06:57 +0800 Subject: [PATCH] chore: remove llrt submodule --- .gitmodules | 3 --- Cargo.lock | 38 +++++++++++++++++++++++++------------- Cargo.toml | 2 +- llrt | 1 - rust-toolchain.toml | 2 ++ 5 files changed, 28 insertions(+), 18 deletions(-) delete mode 160000 llrt create mode 100644 rust-toolchain.toml diff --git a/.gitmodules b/.gitmodules index 015d3d0..06eb70b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "llrt"] - path = llrt - url = https://github.com/awslabs/llrt.git [submodule "rquickjs"] path = rquickjs url = https://github.com/sxzz/rquickjs.git diff --git a/Cargo.lock b/Cargo.lock index a747e2e..fe2a99b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -792,7 +792,7 @@ dependencies = [ "js-sys", "libc", "r-efi", - "wasi 0.14.2+wasi-0.2.4", + "wasi 0.14.3+wasi-0.2.4", "wasm-bindgen", ] @@ -1118,6 +1118,7 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" [[package]] name = "llrt_buffer" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "itoa", "llrt_encoding", @@ -1129,6 +1130,7 @@ dependencies = [ [[package]] name = "llrt_build" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "rustc_version", ] @@ -1136,6 +1138,7 @@ dependencies = [ [[package]] name = "llrt_console" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_logging", "llrt_utils", @@ -1145,6 +1148,7 @@ dependencies = [ [[package]] name = "llrt_context" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_build", "llrt_utils", @@ -1156,6 +1160,7 @@ dependencies = [ [[package]] name = "llrt_encoding" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "base64-simd", "hex-simd", @@ -1167,6 +1172,7 @@ dependencies = [ [[package]] name = "llrt_fs" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "either", "llrt_buffer", @@ -1181,6 +1187,7 @@ dependencies = [ [[package]] name = "llrt_hooking" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_utils", "once_cell", @@ -1190,6 +1197,7 @@ dependencies = [ [[package]] name = "llrt_json" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "itoa", "llrt_build", @@ -1202,6 +1210,7 @@ dependencies = [ [[package]] name = "llrt_logging" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "itoa", "llrt_context", @@ -1216,6 +1225,7 @@ dependencies = [ [[package]] name = "llrt_modules" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_buffer", "llrt_console", @@ -1229,6 +1239,7 @@ dependencies = [ [[package]] name = "llrt_numbers" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "itoa", "llrt_utils", @@ -1239,6 +1250,7 @@ dependencies = [ [[package]] name = "llrt_path" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_utils", "memchr", @@ -1248,6 +1260,7 @@ dependencies = [ [[package]] name = "llrt_process" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "libc", "llrt_utils", @@ -1257,6 +1270,7 @@ dependencies = [ [[package]] name = "llrt_timers" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_context", "llrt_hooking", @@ -1269,6 +1283,7 @@ dependencies = [ [[package]] name = "llrt_utils" version = "0.6.2-beta" +source = "git+https://github.com/awslabs/llrt.git#6808d8f69deb9cd1e620d202526ae5739e72ad21" dependencies = [ "llrt_build", "rquickjs", @@ -2135,9 +2150,9 @@ dependencies = [ [[package]] name = "potential_utf" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a" dependencies = [ "zerovec", ] @@ -3378,11 +3393,11 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" -version = "0.14.2+wasi-0.2.4" +version = "0.14.3+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +checksum = "6a51ae83037bdd272a9e28ce236db8c07016dd0d50c27038b3f407533c030c95" dependencies = [ - "wit-bindgen-rt", + "wit-bindgen", ] [[package]] @@ -3465,7 +3480,7 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -3699,13 +3714,10 @@ dependencies = [ ] [[package]] -name = "wit-bindgen-rt" -version = "0.39.0" +name = "wit-bindgen" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" -dependencies = [ - "bitflags 2.9.3", -] +checksum = "052283831dbae3d879dc7f51f3d92703a316ca49f91540417d38591826127814" [[package]] name = "writeable" diff --git a/Cargo.toml b/Cargo.toml index 6780f92..793d29b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ path = "./rquickjs" features = ["loader", "parallel", "full-async"] [dependencies.llrt_modules] -path = "llrt/llrt_modules" +git = "https://github.com/awslabs/llrt.git" features = ["console", "timers", "fs", "buffer", "process"] default-features = false diff --git a/llrt b/llrt deleted file mode 160000 index 6808d8f..0000000 --- a/llrt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6808d8f69deb9cd1e620d202526ae5739e72ad21 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..292fe49 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "stable" -- 2.51.2