Skip to content

Commit 12235df

Browse files
committed
Remove remaining references to workspaces
1 parent 46dd24b commit 12235df

File tree

5 files changed

+12
-51
lines changed

5 files changed

+12
-51
lines changed

.github/workflows/master-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
crate: cargo-tarpaulin
2121
- name: Run cargo-tarpaulin
2222
run: |
23-
cargo +nightly tarpaulin --workspace --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
23+
cargo +nightly tarpaulin --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
2424
- name: Post to Coveralls
2525
uses: coverallsapp/github-action@v2
2626
with:

.github/workflows/pull-request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@v3
4444
- uses: dtolnay/rust-toolchain@stable
45-
- run: cargo doc --all-features --workspace
45+
- run: cargo doc --all-features
4646
format:
4747
runs-on: ubuntu-latest
4848
timeout-minutes: 10
@@ -71,7 +71,7 @@ jobs:
7171
crate: cargo-tarpaulin
7272
- name: Run cargo-tarpaulin
7373
run: |
74-
cargo +nightly tarpaulin --workspace --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
74+
cargo +nightly tarpaulin --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
7575
- name: Post to Coveralls
7676
uses: coverallsapp/github-action@v2
7777
with:
@@ -105,7 +105,7 @@ jobs:
105105
- name: Test
106106
env:
107107
RUSTFLAGS: '--cap-lints warn'
108-
run: cargo test --target x86_64-pc-windows-msvc --workspace
108+
run: cargo test --target x86_64-pc-windows-msvc
109109
- name: Build and Run
110110
env:
111111
RUSTFLAGS: '--cap-lints warn'

Makefile.toml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ condition = { platforms = ["linux"] }
5757
env = { "RUSTFLAGS" = "-C link-dead-code" }
5858
args = [
5959
"tarpaulin",
60-
"--workspace",
6160
"--all-features",
6261
"--ignore-tests",
6362
"--line",
@@ -82,7 +81,6 @@ command = "cargo"
8281
args = [
8382
"doc",
8483
"--all-features",
85-
"--workspace",
8684
"${@}"
8785
]
8886

@@ -94,7 +92,6 @@ command = "cargo"
9492
args = [
9593
"doc",
9694
"--all-features",
97-
"--workspace",
9895
"${@}"
9996
]
10097

@@ -110,7 +107,6 @@ toolchain = "stable"
110107
command = "cargo"
111108
args = [
112109
"clippy",
113-
"--workspace",
114110
"--all-targets",
115111
"--all-features",
116112
"${@}"
@@ -123,7 +119,6 @@ ignore_errors = true
123119
command = "cargo"
124120
args = [
125121
"clippy",
126-
"--workspace",
127122
"--all-targets",
128123
"--all-features",
129124
"${@}"
@@ -160,15 +155,19 @@ script = ['''
160155
cargo +nightly about generate "docs/licenses.hbs" > "docs/licenses.html"
161156
''']
162157

163-
[tasks.publish]
164-
command = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/scripts/publish.bash"
165-
166158
[tasks.test]
167159
dependencies = ["update-rust-stable"]
168160
toolchain = "stable"
169161
install_crate = false
170162
command = "cargo"
171-
args = ["test", "--workspace"]
163+
args = ["test"]
164+
165+
[tasks.test-nightly]
166+
dependencies = ["update-rust-nightly"]
167+
toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}"
168+
install_crate = false
169+
command = "cargo"
170+
args = ["test"]
172171

173172
[tasks.update-rust-stable]
174173
command = "rustup"

scripts/publish.bash

Lines changed: 0 additions & 38 deletions
This file was deleted.

test.txt

Whitespace-only changes.

0 commit comments

Comments
 (0)