Remove remaining references to workspaces

5 files changed, 12 insertions, 51 deletions

diff --git a/.github/workflows/master-coverage.yml b/.github/workflows/master-coverage.yml
index 3b702b4..72e4041 100644
--- a/.github/workflows/master-coverage.yml
+++ b/.github/workflows/master-coverage.yml
@@ -20,7 +20,7 @@ jobs:
           crate: cargo-tarpaulin
       - name: Run cargo-tarpaulin
         run: |
-          cargo +nightly tarpaulin --workspace --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
+          cargo +nightly tarpaulin --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
       - name: Post to Coveralls
         uses: coverallsapp/github-action@v2
         with:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 061c4d4..cff77ef 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@stable
-      - run: cargo doc --all-features --workspace
+      - run: cargo doc --all-features
   format:
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -71,7 +71,7 @@ jobs:
           crate: cargo-tarpaulin
       - name: Run cargo-tarpaulin
         run: |
-          cargo +nightly tarpaulin --workspace --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
+          cargo +nightly tarpaulin --all-features --ignore-tests --line --output-dir coverage --timeout 10 --out Lcov
       - name: Post to Coveralls
         uses: coverallsapp/github-action@v2
         with:
@@ -105,7 +105,7 @@ jobs:
       - name: Test
         env:
           RUSTFLAGS: '--cap-lints warn'
-        run: cargo test --target x86_64-pc-windows-msvc --workspace
+        run: cargo test --target x86_64-pc-windows-msvc
       - name: Build and Run
         env:
           RUSTFLAGS: '--cap-lints warn'
diff --git a/Makefile.toml b/Makefile.toml
index 9300d03..2f5d3f4 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -57,7 +57,6 @@ condition = { platforms = ["linux"] }
 env = { "RUSTFLAGS" = "-C link-dead-code" }
 args = [
 	"tarpaulin",
-	"--workspace",
 	"--all-features",
 	"--ignore-tests",
 	"--line",
@@ -82,7 +81,6 @@ command = "cargo"
 args = [
 	"doc",
 	"--all-features",
-	"--workspace",
 	"${@}"
 ]
 
@@ -94,7 +92,6 @@ command = "cargo"
 args = [
 	"doc",
 	"--all-features",
-	"--workspace",
 	"${@}"
 ]
 
@@ -110,7 +107,6 @@ toolchain = "stable"
 command = "cargo"
 args = [
 	"clippy",
-	"--workspace",
 	"--all-targets",
 	"--all-features",
 	"${@}"
@@ -123,7 +119,6 @@ ignore_errors = true
 command = "cargo"
 args = [
 	"clippy",
-	"--workspace",
 	"--all-targets",
 	"--all-features",
 	"${@}"
@@ -160,15 +155,19 @@ script = ['''
 cargo +nightly about generate "docs/licenses.hbs" > "docs/licenses.html"
 ''']
 
-[tasks.publish]
-command = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/scripts/publish.bash"
-
 [tasks.test]
 dependencies = ["update-rust-stable"]
 toolchain = "stable"
 install_crate = false
 command = "cargo"
-args = ["test", "--workspace"]
+args = ["test"]
+
+[tasks.test-nightly]
+dependencies = ["update-rust-nightly"]
+toolchain = "nightly${RUST_NIGHTLY_VERSION_PREFIX}"
+install_crate = false
+command = "cargo"
+args = ["test"]
 
 [tasks.update-rust-stable]
 command = "rustup"
diff --git a/scripts/publish.bash b/scripts/publish.bash
deleted file mode 100755
index 2376ac1..0000000
--- a/scripts/publish.bash
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-if [[ -z "$PUBLISH" ]]; then
-	1>&2 echo "Set PUBLISH environment variable to publish"
-	exit 1
-fi
-
-set -euo pipefail
-
-if [[ ! -f "$PWD/Cargo.lock" ]]; then
-	1>&2 echo "This script must be run from the project root directory"
-	exit 1
-fi
-
-# order is based on dependency graph
-crates=(
-	"src/testutils"
-	"src/git"
-	"src/config"
-	"src/display"
-	"src/todo_file"
-	"src/runtime"
-	"src/input"
-	"src/view"
-	"src/core"
-	"src"
-)
-
-for crate in "${crates[@]}"; do
-	(
-		cd "$crate"
-		1>&2 echo "Publishing $crate"
-		cargo publish "$@"
-		1>&2 echo "$crate published"
-		1>&2 echo
-		sleep 10
-	) || true
-done
diff --git a/test.txt b/test.txt
deleted file mode 100644
index e69de29..0000000
--- a/test.txt
+++ /dev/null