diff --git a/query-compiler/query-compiler-wasm/build.sh b/query-compiler/query-compiler-wasm/build.sh index 9076b4e75906..63f3d21c5868 100755 --- a/query-compiler/query-compiler-wasm/build.sh +++ b/query-compiler/query-compiler-wasm/build.sh @@ -54,9 +54,6 @@ fi build() { - echo "ℹ️ Current Rust toolchain version:" - cargo --version - local CONNECTOR="$1" local CARGO_TARGET_DIR CARGO_TARGET_DIR=$(cargo metadata --format-version 1 | jq -r .target_directory) diff --git a/query-engine/query-engine-wasm/build.sh b/query-engine/query-engine-wasm/build.sh index 1671287c7ecd..c35784af8508 100755 --- a/query-engine/query-engine-wasm/build.sh +++ b/query-engine/query-engine-wasm/build.sh @@ -50,19 +50,15 @@ fi build() { - echo "ℹ️ Note that query-engine compiled to WASM uses a different Rust toolchain" - cargo --version - local CONNECTOR="$1" local CARGO_TARGET_DIR CARGO_TARGET_DIR=$(cargo metadata --format-version 1 | jq -r .target_directory) echo "🔨 Building $CONNECTOR" - RUSTFLAGS="-Zlocation-detail=none" CARGO_PROFILE_RELEASE_OPT_LEVEL="z" cargo build \ + CARGO_PROFILE_RELEASE_OPT_LEVEL="z" cargo build \ -p query-engine-wasm \ --profile "$WASM_BUILD_PROFILE" \ --features "$CONNECTOR" \ - --target wasm32-unknown-unknown \ - -Zbuild-std=std,panic_abort -Zbuild-std-features=panic_immediate_abort + --target wasm32-unknown-unknown local IN_FILE="$CARGO_TARGET_DIR/wasm32-unknown-unknown/$WASM_TARGET_SUBDIR/query_engine_wasm.wasm" local OUT_FILE="$OUT_FOLDER/$CONNECTOR/query_engine_bg.wasm" diff --git a/query-engine/query-engine-wasm/rust-toolchain.toml b/query-engine/query-engine-wasm/rust-toolchain.toml deleted file mode 100644 index 51d10a458097..000000000000 --- a/query-engine/query-engine-wasm/rust-toolchain.toml +++ /dev/null @@ -1,6 +0,0 @@ -[toolchain] -channel = "nightly-2024-11-20" -components = ["clippy", "rustfmt", "rust-src"] -targets = [ - "wasm32-unknown-unknown", -]