diff --git a/parser/Makefile.toml b/parser/Makefile.toml index 09d1a3b..56a80d5 100644 --- a/parser/Makefile.toml +++ b/parser/Makefile.toml @@ -36,22 +36,23 @@ script = [ "mkdir -p ../dist/cpp/${CONFIGURATION}", "rm -rf ../dist/cpp/${CONFIGURATION}/*", - "cargo build -Z unstable-options --target ${TARGET} ${CARGO_OPTIONS} --artifact-dir target/cpp/${CONFIGURATION}", - "cp target/cpp/${CONFIGURATION}/libmilo_parser.a ../dist/cpp/${CONFIGURATION}/libmilo.a", + "cargo build --target ${TARGET} ${CARGO_OPTIONS}", + "cp target/${TARGET}/release/libmilo_parser.a ../dist/cpp/${CONFIGURATION}/libmilo.a", "cp target/headers/milo.h ../dist/cpp/${CONFIGURATION}", "node ../scripts/postbuild-cpp.js ${CONFIGURATION}", ] [tasks."cpp:headers"] + env = { RUSTC_BOOTSTRAP = "1" } command = "cbindgen" args = ["--quiet", "--output", "target/headers/milo.h"] [tasks."wasm:release"] - env = { CONFIGURATION = "release", CARGO_BUILD_OPTIONS = "-Z unstable-options -Z build-std=std,panic_abort", CARGO_OPTIONS = "--release", RUSTFLAGS_BASE = "-Z unstable-options -C panic=immediate-abort", WASMPACK_OPTIONS = "--release" } + env = { CONFIGURATION = "release", CARGO_OPTIONS = "--release", RUSTFLAGS_BASE = "-C panic=abort", WASMPACK_OPTIONS = "--release" } run_task = "wasm:module" [tasks."wasm:debug"] - env = { CONFIGURATION = "debug", CARGO_BUILD_OPTIONS = "-Z unstable-options", CARGO_OPTIONS = "--release --features debug", RUSTFLAGS_BASE = "", WASMPACK_OPTIONS = "--release" } + env = { CONFIGURATION = "debug", CARGO_OPTIONS = "--release --features debug", RUSTFLAGS_BASE = "", WASMPACK_OPTIONS = "--release" } run_task = "wasm:module" [tasks."wasm:module"] @@ -59,10 +60,10 @@ "mkdir -p ../dist/wasm", "rm -rf ../dist/wasm/${CONFIGURATION}", "mkdir -p ../dist/wasm/${CONFIGURATION}/binary", - "RUSTFLAGS=\"${RUSTFLAGS_BASE} -C target-feature=+simd128\" cargo build --lib ${CARGO_BUILD_OPTIONS} --target wasm32-unknown-unknown ${CARGO_OPTIONS}", + "RUSTFLAGS=\"${RUSTFLAGS_BASE} -C target-feature=+simd128\" cargo build --lib --target wasm32-unknown-unknown ${CARGO_OPTIONS}", "cp -a target/wasm32-unknown-unknown/release/milo_parser.wasm ../dist/wasm/${CONFIGURATION}/binary/simd.wasm", "wasm-opt -O3 --enable-bulk-memory-opt --enable-simd -o ../dist/wasm/${CONFIGURATION}/binary/simd.wasm ../dist/wasm/${CONFIGURATION}/binary/simd.wasm", - "RUSTFLAGS=\"${RUSTFLAGS_BASE}\" cargo build --lib ${CARGO_BUILD_OPTIONS} --target wasm32-unknown-unknown ${CARGO_OPTIONS}", + "RUSTFLAGS=\"${RUSTFLAGS_BASE}\" cargo build --lib --target wasm32-unknown-unknown ${CARGO_OPTIONS}", "cp -a target/wasm32-unknown-unknown/release/milo_parser.wasm ../dist/wasm/${CONFIGURATION}/binary/no-simd.wasm", "wasm-opt -O3 --enable-bulk-memory-opt -o ../dist/wasm/${CONFIGURATION}/binary/no-simd.wasm ../dist/wasm/${CONFIGURATION}/binary/no-simd.wasm", "node ../scripts/postbuild-wasm.js ${CONFIGURATION}", diff --git a/references/rust/Makefile.toml b/references/rust/Makefile.toml index d9b08ed..d1d18b2 100644 --- a/references/rust/Makefile.toml +++ b/references/rust/Makefile.toml @@ -17,30 +17,17 @@ args = ["--test", "../reference.js"] [tasks.release] - command = "cargo" - args = [ - "build", - "-Z", - "unstable-options", - "--target", - "${TARGET}", - "--target-dir", - "../../tmp/references/rust/targets/release", - "--release", - "--artifact-dir", - "../../tmp/references/rust/release", + script = [ + "cargo build --target ${TARGET} --target-dir ../../tmp/references/rust/targets/release --release", + "mkdir -p ../../tmp/references/rust/release", + "cp ../../tmp/references/rust/targets/release/${TARGET}/release/readme ../../tmp/references/rust/release/", + "cp ../../tmp/references/rust/targets/release/${TARGET}/release/reference ../../tmp/references/rust/release/", ] [tasks.debug] - command = "cargo" - args = [ - "build", - "-Z", - "unstable-options", - "--target", - "${TARGET}", - "--target-dir", - "../../tmp/references/rust/targets/debug", - "--artifact-dir", - "../../tmp/references/rust/debug", + script = [ + "cargo build --target ${TARGET} --target-dir ../../tmp/references/rust/targets/debug", + "mkdir -p ../../tmp/references/rust/debug", + "cp ../../tmp/references/rust/targets/debug/${TARGET}/debug/readme ../../tmp/references/rust/debug/", + "cp ../../tmp/references/rust/targets/debug/${TARGET}/debug/reference ../../tmp/references/rust/debug/", ] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5d56faf..292fe49 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly" +channel = "stable"