diff --git a/.github/workflows/rust_basic.yml b/.github/workflows/rust_basic.yml index 1746f3915..2e5549cdc 100644 --- a/.github/workflows/rust_basic.yml +++ b/.github/workflows/rust_basic.yml @@ -32,7 +32,7 @@ jobs: key: ${{ runner.os }}-cargo-${{ inputs.workspace }}-$GITHUB_SHA restore-keys: ${{ runner.os }}-cargo-${{ inputs.workspace }} - name: Rust lint - run: cargo clippy --workspace -- -D warnings --A deprecated + run: cargo lint working-directory: smart-contracts/${{ inputs.workspace }}/${{ inputs.target }} - name: Rust format check run: cargo fmt --all -- --check diff --git a/.github/workflows/test_tube_osmosis.yml b/.github/workflows/test_tube_osmosis.yml index 73cf14160..97099e264 100644 --- a/.github/workflows/test_tube_osmosis.yml +++ b/.github/workflows/test_tube_osmosis.yml @@ -49,7 +49,7 @@ jobs: key: ${{ runner.os }}-cargo-osmosis-$GITHUB_SHA restore-keys: ${{ runner.os }}-cargo-osmosis - name: Rust lint - run: cargo clippy --features test-tube --all-targets -- -D warnings --A deprecated + run: cargo clippy --features test-tube --all-targets -- -D warnings working-directory: smart-contracts/osmosis - name: Build merkle-incentives run: cargo test-tube-build diff --git a/scripts/git/pre-commit b/scripts/git/pre-commit index 0b3c878f6..059a5726e 100755 --- a/scripts/git/pre-commit +++ b/scripts/git/pre-commit @@ -69,7 +69,7 @@ check_lint() { then echo "Changes in ${target}" cd ${REPO_ROOT}/smart-contracts/${target} - cargo clippy -- -D warnings + cargo clippy --all-targets -- -D warnings cd - fi } diff --git a/smart-contracts/osmosis/.cargo/config.toml b/smart-contracts/osmosis/.cargo/config.toml index fcfdb2f1a..7ad1f6f91 100644 --- a/smart-contracts/osmosis/.cargo/config.toml +++ b/smart-contracts/osmosis/.cargo/config.toml @@ -1,8 +1,6 @@ [alias] wasm = "build --release --target wasm32-unknown-unknown" schema = "run --example schema" -lint = "clippy -- -D warnings" -lint-fix = "clippy --fix -- -D warnings" -unit-test = "test --lib" -test-vault = "test --lib -p basic-vault" -clip = "clippy -- --D warnings --A deprecated" \ No newline at end of file +lint = "clippy --all-targets -- -D warnings" +lint-fix = "clippy --all-targets --fix -- -D warnings" +unit-test = "test --lib" \ No newline at end of file diff --git a/smart-contracts/quasar/.cargo/config.toml b/smart-contracts/quasar/.cargo/config.toml new file mode 100644 index 000000000..7ad1f6f91 --- /dev/null +++ b/smart-contracts/quasar/.cargo/config.toml @@ -0,0 +1,6 @@ +[alias] +wasm = "build --release --target wasm32-unknown-unknown" +schema = "run --example schema" +lint = "clippy --all-targets -- -D warnings" +lint-fix = "clippy --all-targets --fix -- -D warnings" +unit-test = "test --lib" \ No newline at end of file