diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 7888042fc..61995b7ef 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -79,7 +79,7 @@ jobs: - name: Install nightly uses: dtolnay/rust-toolchain@nightly - name: cargo doc - run: cargo doc --workspace --no-deps --all-features + run: cargo doc --no-deps --all-features env: RUSTDOCFLAGS: --cfg docsrs hack: diff --git a/.github/workflows/nostd.yml b/.github/workflows/nostd.yml index 2bc67b248..bc79972cd 100644 --- a/.github/workflows/nostd.yml +++ b/.github/workflows/nostd.yml @@ -29,4 +29,4 @@ jobs: - name: rustup target add ${{ matrix.target }} run: rustup target add ${{ matrix.target }} - name: cargo check - run: cargo check --release --target ${{ matrix.target }} --no-default-features --workspace --all-features + run: cargo check --release --target ${{ matrix.target }} --no-default-features --all-features diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e6d24f94..49b3a402f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,10 +50,10 @@ jobs: run: cargo generate-lockfile # https://twitter.com/jonhoo/status/1571290371124260865 - name: cargo test --locked - run: cargo test --locked --all-features --all-targets --workspace + run: cargo test --locked --all-features --all-targets # https://github.com/rust-lang/cargo/issues/6669 - name: cargo test --doc - run: cargo test --locked --all-features --doc --workspace + run: cargo test --locked --all-features --doc os-check: # Run cargo test on MacOS and Windows. runs-on: ${{ matrix.os }} @@ -74,7 +74,7 @@ jobs: if: hashFiles('Cargo.lock') == '' run: cargo generate-lockfile - name: cargo test - run: cargo test --locked --all-features --all-targets --workspace + run: cargo test --locked --all-features --all-targets coverage: # Use llvm-cov to build and collect coverage and outputs in a format that # is compatible with codecov.io. diff --git a/Cargo.toml b/Cargo.toml index 9df9617e9..be16a22f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ members = [ "examples/erc20", "examples/erc721", "examples/merkle-proofs", - "examples/erc721", "examples/ownable", "integration", ] diff --git a/GUIDELINES.md b/GUIDELINES.md index 3c2a9d98a..6f41be091 100644 --- a/GUIDELINES.md +++ b/GUIDELINES.md @@ -193,7 +193,7 @@ Some other examples of automation are: Always check your code with the linter (`clippy`), by running: - $ cargo clippy --workspace --tests --all-features + $ cargo clippy --tests --all-features And make sure your code is formatted with, using: @@ -205,14 +205,14 @@ Finally, ensure there is no trailing whitespace anywhere. Make sure all tests are passing with: - $ cargo test --workspace --all-features + $ cargo test --all-features ### Checking the docs If you make documentation changes, you may want to check whether there are any warnings or errors: - $ cargo doc --workspace --all-features + $ cargo doc --all-features ## Pull requests