Move the main crate to the top level of the repo (#498)

Once upon a time, there were several crates in a workspace here. Now all that's left is `xtask`, which is just a command-line utility for development. So, let's move the main code to the top level of the repo. This has no behavioral change - it is just moving things about.
GothenburgBitFactory · Dec 9, 2024 · b16a558 · b16a558
1 parent ca77420
commit b16a558
Show file tree

Hide file tree

Showing 55 changed files with 53 additions and 96 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,38 +1,67 @@
+[package]
+name = "taskchampion"
+version = "1.0.0-pre"
+authors = ["Dustin J. Mitchell <[email protected]>"]
+description = "Personal task-tracking"
+homepage = "https://gothenburgbitfactory.github.io/taskchampion/"
+documentation = "https://docs.rs/crate/taskchampion"
+repository = "https://github.com/GothenburgBitFactory/taskchampion"
+readme = "src/crate-doc.md"
+license = "MIT"
+edition = "2021"
+rust-version = "1.78.0"
+
 [workspace]
+members = [ "xtask" ]
+resolver = "2"
 
-members = [
-    "taskchampion",
-    "xtask",
-]
+[features]
+default = ["sync", "bundled"]
 
-resolver = "2"
+# Support for all sync solutions
+sync = ["server-sync", "server-gcp", "server-aws"]
+# Support for sync to a server
+server-sync = ["encryption", "dep:ureq", "dep:url"]
+# Support for sync to GCP
+server-gcp = ["cloud", "encryption", "dep:google-cloud-storage", "dep:tokio"]
+# Support for sync to AWS
+server-aws = ["cloud", "encryption", "dep:aws-sdk-s3", "dep:aws-config", "dep:aws-credential-types", "dep:tokio"]
+# (private) Support for sync protocol encryption
+encryption = ["dep:ring"]
+# (private) Generic support for cloud sync
+cloud = []
+# static bundling of dependencies
+bundled = ["rusqlite/bundled"]
+# use native CA roots, instead of bundled
+tls-native-roots = ["ureq/native-certs"]
+
+[package.metadata.docs.rs]
+all-features = true
 
-# All Rust dependencies are defined here, and then referenced by the
-# Cargo.toml's in the members with `foo.workspace = true`.
-[workspace.dependencies]
+[dependencies]
 anyhow = "1.0"
-aws-sdk-s3 = "1"
-aws-config = { version = "1", features = ["behavior-version-latest"] }
-aws-credential-types = { version = "1", features = ["hardcoded-credentials"] }
+aws-sdk-s3 = { version = "1", optional = true }
+aws-config = { version = "1", features = ["behavior-version-latest"], optional = true }
+aws-credential-types = { version = "1", features = ["hardcoded-credentials"], optional = true }
 byteorder = "1.5"
 chrono = { version = "^0.4.38", features = ["serde"] }
-ffizz-header = "0.5"
 flate2 = "1"
-google-cloud-storage = { version = "0.15.0", default-features = false, features = ["rustls-tls", "auth"] }
+google-cloud-storage = { version = "0.15.0", default-features = false, features = ["rustls-tls", "auth"], optional = true }
 log = "^0.4.17"
-pretty_assertions = "1"
-proptest = "^1.5.0"
-regex = "^1.11.0"
-ring = "0.17"
-rstest = "0.17"
+ring = { version = "0.17", optional = true }
 rusqlite = { version = "0.29"}
 serde_json = "^1.0"
 serde = { version = "^1.0.147", features = ["derive"] }
 strum = "0.25"
 strum_macros = "0.25"
-tempfile = "3"
-tokio = { version = "1", features = ["rt-multi-thread"] }
+tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
 thiserror = "1.0"
-ureq = { version = "^2.12.0", features = ["tls"] }
+ureq = { version = "^2.12.0", features = ["tls"], optional = true }
 uuid = { version = "^1.11.0", features = ["serde", "v4"] }
-url = { version = "2" }
+url = { version = "2", optional = true }
+
+[dev-dependencies]
+proptest = "^1.5.0"
+tempfile = "3"
+rstest = "0.17"
+pretty_assertions = "1"
diff --git a/taskchampion/src/crate-doc.md → src/crate-doc.md b/taskchampion/src/crate-doc.md → src/crate-doc.md
diff --git a/taskchampion/src/depmap.rs → src/depmap.rs b/taskchampion/src/depmap.rs → src/depmap.rs
diff --git a/taskchampion/src/errors.rs → src/errors.rs b/taskchampion/src/errors.rs → src/errors.rs
diff --git a/taskchampion/src/lib.rs → src/lib.rs b/taskchampion/src/lib.rs → src/lib.rs
diff --git a/taskchampion/src/operation.rs → src/operation.rs b/taskchampion/src/operation.rs → src/operation.rs
diff --git a/taskchampion/src/replica.rs → src/replica.rs b/taskchampion/src/replica.rs → src/replica.rs
diff --git a/taskchampion/src/server/cloud/aws.rs → src/server/cloud/aws.rs b/taskchampion/src/server/cloud/aws.rs → src/server/cloud/aws.rs
diff --git a/taskchampion/src/server/cloud/gcp.rs → src/server/cloud/gcp.rs b/taskchampion/src/server/cloud/gcp.rs → src/server/cloud/gcp.rs
diff --git a/taskchampion/src/server/cloud/mod.rs → src/server/cloud/mod.rs b/taskchampion/src/server/cloud/mod.rs → src/server/cloud/mod.rs
diff --git a/taskchampion/src/server/cloud/server.rs → src/server/cloud/server.rs b/taskchampion/src/server/cloud/server.rs → src/server/cloud/server.rs
diff --git a/taskchampion/src/server/cloud/service.rs → src/server/cloud/service.rs b/taskchampion/src/server/cloud/service.rs → src/server/cloud/service.rs
diff --git a/taskchampion/src/server/cloud/test.rs → src/server/cloud/test.rs b/taskchampion/src/server/cloud/test.rs → src/server/cloud/test.rs
diff --git a/taskchampion/src/server/config.rs → src/server/config.rs b/taskchampion/src/server/config.rs → src/server/config.rs
diff --git a/taskchampion/src/server/encryption.rs → src/server/encryption.rs b/taskchampion/src/server/encryption.rs → src/server/encryption.rs
diff --git a/...champion/src/server/generate-test-data.py → src/server/generate-test-data.py b/...champion/src/server/generate-test-data.py → src/server/generate-test-data.py
diff --git a/taskchampion/src/server/local/mod.rs → src/server/local/mod.rs b/taskchampion/src/server/local/mod.rs → src/server/local/mod.rs
diff --git a/taskchampion/src/server/mod.rs → src/server/mod.rs b/taskchampion/src/server/mod.rs → src/server/mod.rs
diff --git a/taskchampion/src/server/op.rs → src/server/op.rs b/taskchampion/src/server/op.rs → src/server/op.rs
diff --git a/taskchampion/src/server/sync/mod.rs → src/server/sync/mod.rs b/taskchampion/src/server/sync/mod.rs → src/server/sync/mod.rs
diff --git a/taskchampion/src/server/test-bad-app-id.data → src/server/test-bad-app-id.data b/taskchampion/src/server/test-bad-app-id.data → src/server/test-bad-app-id.data
diff --git a/...ampion/src/server/test-bad-client-id.data → src/server/test-bad-client-id.data b/...ampion/src/server/test-bad-client-id.data → src/server/test-bad-client-id.data
diff --git a/taskchampion/src/server/test-bad-secret.data → src/server/test-bad-secret.data b/taskchampion/src/server/test-bad-secret.data → src/server/test-bad-secret.data
diff --git a/...mpion/src/server/test-bad-version-id.data → src/server/test-bad-version-id.data b/...mpion/src/server/test-bad-version-id.data → src/server/test-bad-version-id.data
diff --git a/...champion/src/server/test-bad-version.data → src/server/test-bad-version.data b/...champion/src/server/test-bad-version.data → src/server/test-bad-version.data
diff --git a/...mpion/src/server/test-bad-version_id.data → src/server/test-bad-version_id.data b/...mpion/src/server/test-bad-version_id.data → src/server/test-bad-version_id.data
diff --git a/taskchampion/src/server/test-good.data → src/server/test-good.data b/taskchampion/src/server/test-good.data → src/server/test-good.data
diff --git a/taskchampion/src/server/test.rs → src/server/test.rs b/taskchampion/src/server/test.rs → src/server/test.rs
diff --git a/taskchampion/src/server/types.rs → src/server/types.rs b/taskchampion/src/server/types.rs → src/server/types.rs
diff --git a/taskchampion/src/storage/config.rs → src/storage/config.rs b/taskchampion/src/storage/config.rs → src/storage/config.rs
diff --git a/taskchampion/src/storage/inmemory.rs → src/storage/inmemory.rs b/taskchampion/src/storage/inmemory.rs → src/storage/inmemory.rs
diff --git a/taskchampion/src/storage/mod.rs → src/storage/mod.rs b/taskchampion/src/storage/mod.rs → src/storage/mod.rs
diff --git a/taskchampion/src/storage/sqlite.rs → src/storage/sqlite.rs b/taskchampion/src/storage/sqlite.rs → src/storage/sqlite.rs
diff --git a/taskchampion/src/storage/sqlite/schema.rs → src/storage/sqlite/schema.rs b/taskchampion/src/storage/sqlite/schema.rs → src/storage/sqlite/schema.rs
diff --git a/taskchampion/src/storage/test.rs → src/storage/test.rs b/taskchampion/src/storage/test.rs → src/storage/test.rs
diff --git a/taskchampion/src/task/annotation.rs → src/task/annotation.rs b/taskchampion/src/task/annotation.rs → src/task/annotation.rs
diff --git a/taskchampion/src/task/data.rs → src/task/data.rs b/taskchampion/src/task/data.rs → src/task/data.rs
diff --git a/taskchampion/src/task/mod.rs → src/task/mod.rs b/taskchampion/src/task/mod.rs → src/task/mod.rs
diff --git a/taskchampion/src/task/status.rs → src/task/status.rs b/taskchampion/src/task/status.rs → src/task/status.rs
diff --git a/taskchampion/src/task/tag.rs → src/task/tag.rs b/taskchampion/src/task/tag.rs → src/task/tag.rs
diff --git a/taskchampion/src/task/task.rs → src/task/task.rs b/taskchampion/src/task/task.rs → src/task/task.rs
diff --git a/taskchampion/src/task/time.rs → src/task/time.rs b/taskchampion/src/task/time.rs → src/task/time.rs
diff --git a/taskchampion/src/taskdb/apply.rs → src/taskdb/apply.rs b/taskchampion/src/taskdb/apply.rs → src/taskdb/apply.rs
diff --git a/taskchampion/src/taskdb/mod.rs → src/taskdb/mod.rs b/taskchampion/src/taskdb/mod.rs → src/taskdb/mod.rs
diff --git a/taskchampion/src/taskdb/snapshot.rs → src/taskdb/snapshot.rs b/taskchampion/src/taskdb/snapshot.rs → src/taskdb/snapshot.rs
diff --git a/taskchampion/src/taskdb/sync.rs → src/taskdb/sync.rs b/taskchampion/src/taskdb/sync.rs → src/taskdb/sync.rs
diff --git a/taskchampion/src/taskdb/undo.rs → src/taskdb/undo.rs b/taskchampion/src/taskdb/undo.rs → src/taskdb/undo.rs
diff --git a/taskchampion/src/taskdb/working_set.rs → src/taskdb/working_set.rs b/taskchampion/src/taskdb/working_set.rs → src/taskdb/working_set.rs
diff --git a/taskchampion/src/utils.rs → src/utils.rs b/taskchampion/src/utils.rs → src/utils.rs
diff --git a/taskchampion/src/workingset.rs → src/workingset.rs b/taskchampion/src/workingset.rs → src/workingset.rs
diff --git a/taskchampion/Cargo.toml b/taskchampion/Cargo.toml
@@ -1,72 +0,0 @@
-[package]
-name = "taskchampion"
-version = "1.0.0-pre"
-authors = ["Dustin J. Mitchell <[email protected]>"]
-description = "Personal task-tracking"
-homepage = "https://gothenburgbitfactory.github.io/taskchampion/"
-documentation = "https://docs.rs/crate/taskchampion"
-repository = "https://github.com/GothenburgBitFactory/taskchampion"
-readme = "src/crate-doc.md"
-license = "MIT"
-edition = "2021"
-rust-version = "1.78.0"
-
-[features]
-default = ["sync", "bundled"]
-
-# Support for all sync solutions
-sync = ["server-sync", "server-gcp", "server-aws"]
-# Support for sync to a server
-server-sync = ["encryption", "dep:ureq", "dep:url"]
-# Support for sync to GCP
-server-gcp = ["cloud", "encryption", "dep:google-cloud-storage", "dep:tokio"]
-# Support for sync to AWS
-server-aws = ["cloud", "encryption", "dep:aws-sdk-s3", "dep:aws-config", "dep:aws-credential-types", "dep:tokio"]
-# (private) Support for sync protocol encryption
-encryption = ["dep:ring"]
-# (private) Generic support for cloud sync
-cloud = []
-# static bundling of dependencies
-bundled = ["rusqlite/bundled"]
-# use native CA roots, instead of bundled
-tls-native-roots = ["ureq/native-certs"]
-
-[package.metadata.docs.rs]
-all-features = true
-
-[dependencies]
-anyhow.workspace = true
-aws-config.workspace = true
-aws-credential-types.workspace = true
-aws-sdk-s3.workspace = true
-byteorder.workspace = true
-chrono.workspace = true
-flate2.workspace = true
-google-cloud-storage.workspace = true
-log.workspace = true
-ring.workspace = true
-rusqlite.workspace = true
-serde_json.workspace = true
-serde.workspace = true
-strum_macros.workspace = true
-strum.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-ureq.workspace = true
-url.workspace = true
-uuid.workspace = true
-
-aws-config.optional = true
-aws-credential-types.optional = true
-aws-sdk-s3.optional = true
-google-cloud-storage.optional = true
-ring.optional = true
-tokio.optional = true
-ureq.optional = true
-url.optional = true
-
-[dev-dependencies]
-proptest.workspace = true
-tempfile.workspace = true
-rstest.workspace = true
-pretty_assertions.workspace = true

diff --git a/taskchampion/tests/cross-sync.rs → tests/cross-sync.rs b/taskchampion/tests/cross-sync.rs → tests/cross-sync.rs
diff --git a/taskchampion/tests/syncing-proptest.rs → tests/syncing-proptest.rs b/taskchampion/tests/syncing-proptest.rs → tests/syncing-proptest.rs
diff --git a/taskchampion/tests/update-and-delete-sync.rs → tests/update-and-delete-sync.rs b/taskchampion/tests/update-and-delete-sync.rs → tests/update-and-delete-sync.rs
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -5,5 +5,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-anyhow.workspace = true
-regex.workspace = true
+anyhow = "1.0"
+regex = "^1.11.0"