From 9cf8b38a148d6081bd405c8617040b4ec66b7bab Mon Sep 17 00:00:00 2001 From: wtfsck Date: Fri, 28 May 2021 23:06:25 +0200 Subject: [PATCH] Remove db feature from {js,py}/Cargo.toml and build-rust --- build/build-rust | 18 +++++++++--------- src/rust/iced-x86-js/Cargo.toml | 4 ++-- src/rust/iced-x86-py/Cargo.toml | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/build-rust b/build/build-rust index 893f83cc8..6ff0f46d8 100755 --- a/build/build-rust +++ b/build/build-rust @@ -76,7 +76,7 @@ build_no_std() { cd "$root_dir/src/rust/iced-x86" echo "==== BUILD DEBUG ====" - cargo check --color always --no-default-features --features "no_std decoder encoder block_encoder op_code_info instr_info gas intel masm nasm fast_fmt db" + cargo check --color always --no-default-features --features "no_std decoder encoder block_encoder op_code_info instr_info gas intel masm nasm fast_fmt" cd "$curr_dir" } @@ -168,10 +168,10 @@ build_test_current_version() { rustc --version echo "==== CLIPPY RELEASE ====" - cargo clippy --color always --features "db" --release + cargo clippy --color always --release echo "==== CLIPPY RELEASE --tests ====" - cargo clippy --color always --features "db" --release --tests + cargo clippy --color always --release --tests echo "==== FORMAT CHECK ====" cargo fmt -- --color always --check @@ -180,20 +180,20 @@ build_test_current_version() { cargo doc --color always echo "==== BUILD RELEASE ====" - cargo build --color always --features "db" --release + cargo build --color always --release echo "==== TEST RELEASE ====" - cargo test --color always --features "db" --release + cargo test --color always --release # Make sure the two read-mem methods behave the same echo "==== TEST RELEASE: std decoder __internal_mem_vsib ====" cargo test --no-default-features --features "std decoder __internal_mem_vsib" --tests echo "==== TEST DEBUG ====" - cargo test --color always --features "db" --tests + cargo test --color always --tests echo "==== BUILD RELEASE wasm32-unknown-unknown ====" - cargo check --color always --features "db" --target wasm32-unknown-unknown --release + cargo check --color always --target wasm32-unknown-unknown --release echo "==== PUBLISH DRY-RUN ====" # It fails on Windows (GitHub CI) without this, claiming that some random number of Rust files are dirty. @@ -214,10 +214,10 @@ build_test_msrv() { echo "*** If this fails, install Rust $msrv" echo "==== BUILD RELEASE ====" - cargo +$msrv build --color always --features "db" --release + cargo +$msrv build --color always --release echo "==== TEST RELEASE ====" - cargo +$msrv test --color always --features "db" --release + cargo +$msrv test --color always --release cd "$curr_dir" } diff --git a/src/rust/iced-x86-js/Cargo.toml b/src/rust/iced-x86-js/Cargo.toml index a2338d4e1..892d19dd5 100644 --- a/src/rust/iced-x86-js/Cargo.toml +++ b/src/rust/iced-x86-js/Cargo.toml @@ -22,9 +22,9 @@ default = ["instr_api", "decoder", "encoder", "block_encoder", "instr_create", " base = ["iced-x86-rust/std"] instr_api = ["base"] decoder = ["base", "iced-x86-rust/decoder"] -encoder = ["base", "iced-x86-rust/encoder", "iced-x86-rust/db"] +encoder = ["base", "iced-x86-rust/encoder"] block_encoder = ["base", "iced-x86-rust/block_encoder"] -instr_create = ["base", "iced-x86-rust/encoder", "iced-x86-rust/db"] +instr_create = ["base", "iced-x86-rust/encoder"] op_code_info = ["base", "iced-x86-rust/op_code_info"] instr_info = ["base", "iced-x86-rust/instr_info"] gas = ["base", "iced-x86-rust/gas"] diff --git a/src/rust/iced-x86-py/Cargo.toml b/src/rust/iced-x86-py/Cargo.toml index ec0d840bc..d77c2829d 100644 --- a/src/rust/iced-x86-py/Cargo.toml +++ b/src/rust/iced-x86-py/Cargo.toml @@ -26,7 +26,7 @@ version = "=1.11.3" #path = "/abs/path/to/iced/src/rust/iced-x86" # Don't remove/modify the next line. Build scripts replace it with the real path #pathci -features = ["db"] +features = [] [profile.release] codegen-units = 1