diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d3ae95f9c..a945a565d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ -rust/* @dbr @djmitche +taskchampion/* @dbr @djmitche Cargo.toml @dbr @djmitche Cargo.lock @dbr @djmitche diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 13dc57793..760020c72 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -59,8 +59,8 @@ jobs: # if this changes, change it in cli/Cargo.toml and .github/workflows/publish-docs.yml as well mdbook-version: '0.4.10' - - run: mdbook test rust/docs - - run: mdbook build rust/docs + - run: mdbook test taskchampion/docs + - run: mdbook build taskchampion/docs fmt: runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index 94ef9f137..a5a8d7d6e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [workspace] members = [ - "rust/taskchampion", - "rust/sync-server", - "rust/lib", - "rust/integration-tests", - "rust/xtask", + "taskchampion/taskchampion", + "taskchampion/sync-server", + "taskchampion/lib", + "taskchampion/integration-tests", + "taskchampion/xtask", ] # src/tc/rust is just part of the TW build and not a public crate diff --git a/docs/contrib/rust-and-c++.md b/docs/contrib/rust-and-c++.md index 6c7840105..05af79e18 100644 --- a/docs/contrib/rust-and-c++.md +++ b/docs/contrib/rust-and-c++.md @@ -23,7 +23,7 @@ The implementation, including more documentation, is in the [`rust`](../../rust) Taskwarrior's interface to TaskChampion has a few laters: * The skeletal Rust crate in [`src/tc/rust`](../../src/tc/rust) brings the symbols from `taskchampion-lib` under CMake's management. - The corresponding header file is included from [`rust/lib`](../../rust/lib). + The corresponding header file is included from [`taskchampion/lib`](../../taskchampion/lib). All of these symbols are placed in the C++ namespace, `tc::ffi`. * C++ wrappers for the types from `taskchampion-lib` are defined in [`src/tc`](../../src/tc), ensuring memory safety (with `unique_ptr`) and adding methods corresponding to the Rust API's methods. The wrapper types are in the C++ namespace, `tc`. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 001745075..67647e1bf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/libshared/src - ${CMAKE_SOURCE_DIR}/rust/lib + ${CMAKE_SOURCE_DIR}/taskchampion/lib ${TASK_INCLUDE_DIRS}) add_library (task STATIC CLI2.cpp CLI2.h diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt index 67bb00e4a..e0eac77c5 100644 --- a/src/columns/CMakeLists.txt +++ b/src/columns/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/libshared/src - ${CMAKE_SOURCE_DIR}/rust/lib + ${CMAKE_SOURCE_DIR}/taskchampion/lib ${TASK_INCLUDE_DIRS}) set (columns_SRCS Column.cpp Column.h diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index 2d63b6097..58bce521c 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -5,7 +5,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/commands ${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/libshared/src - ${CMAKE_SOURCE_DIR}/rust/lib + ${CMAKE_SOURCE_DIR}/taskchampion/lib ${TASK_INCLUDE_DIRS}) set (commands_SRCS Command.cpp Command.h diff --git a/src/tc/CMakeLists.txt b/src/tc/CMakeLists.txt index 82b07bb12..3b0504f82 100644 --- a/src/tc/CMakeLists.txt +++ b/src/tc/CMakeLists.txt @@ -3,7 +3,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/tc ${CMAKE_SOURCE_DIR}/src/libshared/src - ${CMAKE_SOURCE_DIR}/rust/lib + ${CMAKE_SOURCE_DIR}/taskchampion/lib ${TASK_INCLUDE_DIRS}) set (tc_SRCS diff --git a/src/tc/rust/Cargo.toml b/src/tc/rust/Cargo.toml index ec633ad44..8220b93b8 100644 --- a/src/tc/rust/Cargo.toml +++ b/src/tc/rust/Cargo.toml @@ -6,4 +6,4 @@ version = "0.1.0" crate-type = ["staticlib"] [dependencies] -taskchampion-lib = {path = "../../../rust/lib"} +taskchampion-lib = {path = "../../../taskchampion/lib"} diff --git a/rust/.cargo/audit.toml b/taskchampion/.cargo/audit.toml similarity index 100% rename from rust/.cargo/audit.toml rename to taskchampion/.cargo/audit.toml diff --git a/rust/.cargo/config b/taskchampion/.cargo/config similarity index 100% rename from rust/.cargo/config rename to taskchampion/.cargo/config diff --git a/rust/.changelogs/.gitignore b/taskchampion/.changelogs/.gitignore similarity index 100% rename from rust/.changelogs/.gitignore rename to taskchampion/.changelogs/.gitignore diff --git a/rust/.changelogs/2021-10-03-server-storage.md b/taskchampion/.changelogs/2021-10-03-server-storage.md similarity index 100% rename from rust/.changelogs/2021-10-03-server-storage.md rename to taskchampion/.changelogs/2021-10-03-server-storage.md diff --git a/rust/.changelogs/2021-10-11-issue23-client.md b/taskchampion/.changelogs/2021-10-11-issue23-client.md similarity index 100% rename from rust/.changelogs/2021-10-11-issue23-client.md rename to taskchampion/.changelogs/2021-10-11-issue23-client.md diff --git a/rust/.changelogs/2021-10-16-issue299.md b/taskchampion/.changelogs/2021-10-16-issue299.md similarity index 100% rename from rust/.changelogs/2021-10-16-issue299.md rename to taskchampion/.changelogs/2021-10-16-issue299.md diff --git a/rust/.changelogs/2021-10-25-issue23-integration.md b/taskchampion/.changelogs/2021-10-25-issue23-integration.md similarity index 100% rename from rust/.changelogs/2021-10-25-issue23-integration.md rename to taskchampion/.changelogs/2021-10-25-issue23-integration.md diff --git a/rust/.gitignore b/taskchampion/.gitignore similarity index 100% rename from rust/.gitignore rename to taskchampion/.gitignore diff --git a/rust/CHANGELOG.md b/taskchampion/CHANGELOG.md similarity index 100% rename from rust/CHANGELOG.md rename to taskchampion/CHANGELOG.md diff --git a/rust/CODE_OF_CONDUCT.md b/taskchampion/CODE_OF_CONDUCT.md similarity index 100% rename from rust/CODE_OF_CONDUCT.md rename to taskchampion/CODE_OF_CONDUCT.md diff --git a/rust/CONTRIBUTING.md b/taskchampion/CONTRIBUTING.md similarity index 100% rename from rust/CONTRIBUTING.md rename to taskchampion/CONTRIBUTING.md diff --git a/rust/LICENSE b/taskchampion/LICENSE similarity index 100% rename from rust/LICENSE rename to taskchampion/LICENSE diff --git a/rust/POLICY.md b/taskchampion/POLICY.md similarity index 100% rename from rust/POLICY.md rename to taskchampion/POLICY.md diff --git a/rust/README.md b/taskchampion/README.md similarity index 100% rename from rust/README.md rename to taskchampion/README.md diff --git a/rust/RELEASING.md b/taskchampion/RELEASING.md similarity index 100% rename from rust/RELEASING.md rename to taskchampion/RELEASING.md diff --git a/rust/SECURITY.md b/taskchampion/SECURITY.md similarity index 100% rename from rust/SECURITY.md rename to taskchampion/SECURITY.md diff --git a/rust/build-docs.sh b/taskchampion/build-docs.sh similarity index 100% rename from rust/build-docs.sh rename to taskchampion/build-docs.sh diff --git a/rust/docs/.gitignore b/taskchampion/docs/.gitignore similarity index 100% rename from rust/docs/.gitignore rename to taskchampion/docs/.gitignore diff --git a/rust/docs/README.md b/taskchampion/docs/README.md similarity index 100% rename from rust/docs/README.md rename to taskchampion/docs/README.md diff --git a/rust/docs/assets/cgi/LICENSE.md b/taskchampion/docs/assets/cgi/LICENSE.md similarity index 100% rename from rust/docs/assets/cgi/LICENSE.md rename to taskchampion/docs/assets/cgi/LICENSE.md diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_1024.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_1024.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_1024.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_1024.png diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_128.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_128.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_128.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_128.png diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_16.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_16.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_16.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_16.png diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_256.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_256.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_256.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_256.png diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_32.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_32.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_32.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_32.png diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_512.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_512.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_512.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_512.png diff --git a/rust/docs/assets/cgi/icon_rounded/icon_rounded_64.png b/taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_64.png similarity index 100% rename from rust/docs/assets/cgi/icon_rounded/icon_rounded_64.png rename to taskchampion/docs/assets/cgi/icon_rounded/icon_rounded_64.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_1024.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_1024.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_1024.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_1024.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_128.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_128.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_128.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_128.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_16.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_16.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_16.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_16.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_256.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_256.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_256.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_256.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_32.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_32.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_32.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_32.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_512.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_512.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_512.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_512.png diff --git a/rust/docs/assets/cgi/icon_square/icon_square_64.png b/taskchampion/docs/assets/cgi/icon_square/icon_square_64.png similarity index 100% rename from rust/docs/assets/cgi/icon_square/icon_square_64.png rename to taskchampion/docs/assets/cgi/icon_square/icon_square_64.png diff --git a/rust/docs/assets/cgi/logo/logo_1024.png b/taskchampion/docs/assets/cgi/logo/logo_1024.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_1024.png rename to taskchampion/docs/assets/cgi/logo/logo_1024.png diff --git a/rust/docs/assets/cgi/logo/logo_128.png b/taskchampion/docs/assets/cgi/logo/logo_128.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_128.png rename to taskchampion/docs/assets/cgi/logo/logo_128.png diff --git a/rust/docs/assets/cgi/logo/logo_16.png b/taskchampion/docs/assets/cgi/logo/logo_16.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_16.png rename to taskchampion/docs/assets/cgi/logo/logo_16.png diff --git a/rust/docs/assets/cgi/logo/logo_256.png b/taskchampion/docs/assets/cgi/logo/logo_256.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_256.png rename to taskchampion/docs/assets/cgi/logo/logo_256.png diff --git a/rust/docs/assets/cgi/logo/logo_32.png b/taskchampion/docs/assets/cgi/logo/logo_32.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_32.png rename to taskchampion/docs/assets/cgi/logo/logo_32.png diff --git a/rust/docs/assets/cgi/logo/logo_512.png b/taskchampion/docs/assets/cgi/logo/logo_512.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_512.png rename to taskchampion/docs/assets/cgi/logo/logo_512.png diff --git a/rust/docs/assets/cgi/logo/logo_64.png b/taskchampion/docs/assets/cgi/logo/logo_64.png similarity index 100% rename from rust/docs/assets/cgi/logo/logo_64.png rename to taskchampion/docs/assets/cgi/logo/logo_64.png diff --git a/rust/docs/book.toml b/taskchampion/docs/book.toml similarity index 100% rename from rust/docs/book.toml rename to taskchampion/docs/book.toml diff --git a/rust/docs/src/SUMMARY.md b/taskchampion/docs/src/SUMMARY.md similarity index 100% rename from rust/docs/src/SUMMARY.md rename to taskchampion/docs/src/SUMMARY.md diff --git a/rust/docs/src/data-model.md b/taskchampion/docs/src/data-model.md similarity index 100% rename from rust/docs/src/data-model.md rename to taskchampion/docs/src/data-model.md diff --git a/rust/docs/src/images/name_timestamp.png b/taskchampion/docs/src/images/name_timestamp.png similarity index 100% rename from rust/docs/src/images/name_timestamp.png rename to taskchampion/docs/src/images/name_timestamp.png diff --git a/rust/docs/src/installation.md b/taskchampion/docs/src/installation.md similarity index 100% rename from rust/docs/src/installation.md rename to taskchampion/docs/src/installation.md diff --git a/rust/docs/src/internals.md b/taskchampion/docs/src/internals.md similarity index 100% rename from rust/docs/src/internals.md rename to taskchampion/docs/src/internals.md diff --git a/rust/docs/src/plans.md b/taskchampion/docs/src/plans.md similarity index 100% rename from rust/docs/src/plans.md rename to taskchampion/docs/src/plans.md diff --git a/rust/docs/src/running-sync-server.md b/taskchampion/docs/src/running-sync-server.md similarity index 100% rename from rust/docs/src/running-sync-server.md rename to taskchampion/docs/src/running-sync-server.md diff --git a/rust/docs/src/snapshots.md b/taskchampion/docs/src/snapshots.md similarity index 100% rename from rust/docs/src/snapshots.md rename to taskchampion/docs/src/snapshots.md diff --git a/rust/docs/src/storage.md b/taskchampion/docs/src/storage.md similarity index 100% rename from rust/docs/src/storage.md rename to taskchampion/docs/src/storage.md diff --git a/rust/docs/src/sync-model.md b/taskchampion/docs/src/sync-model.md similarity index 100% rename from rust/docs/src/sync-model.md rename to taskchampion/docs/src/sync-model.md diff --git a/rust/docs/src/sync-protocol.md b/taskchampion/docs/src/sync-protocol.md similarity index 100% rename from rust/docs/src/sync-protocol.md rename to taskchampion/docs/src/sync-protocol.md diff --git a/rust/docs/src/sync.md b/taskchampion/docs/src/sync.md similarity index 100% rename from rust/docs/src/sync.md rename to taskchampion/docs/src/sync.md diff --git a/rust/docs/src/taskdb.md b/taskchampion/docs/src/taskdb.md similarity index 100% rename from rust/docs/src/taskdb.md rename to taskchampion/docs/src/taskdb.md diff --git a/rust/docs/src/tasks.md b/taskchampion/docs/src/tasks.md similarity index 100% rename from rust/docs/src/tasks.md rename to taskchampion/docs/src/tasks.md diff --git a/rust/docs/src/welcome.md b/taskchampion/docs/src/welcome.md similarity index 100% rename from rust/docs/src/welcome.md rename to taskchampion/docs/src/welcome.md diff --git a/rust/integration-tests/.gitignore b/taskchampion/integration-tests/.gitignore similarity index 100% rename from rust/integration-tests/.gitignore rename to taskchampion/integration-tests/.gitignore diff --git a/rust/integration-tests/Cargo.toml b/taskchampion/integration-tests/Cargo.toml similarity index 100% rename from rust/integration-tests/Cargo.toml rename to taskchampion/integration-tests/Cargo.toml diff --git a/rust/integration-tests/README.md b/taskchampion/integration-tests/README.md similarity index 100% rename from rust/integration-tests/README.md rename to taskchampion/integration-tests/README.md diff --git a/rust/integration-tests/build.rs b/taskchampion/integration-tests/build.rs similarity index 100% rename from rust/integration-tests/build.rs rename to taskchampion/integration-tests/build.rs diff --git a/rust/integration-tests/src/bindings_tests/mod.rs b/taskchampion/integration-tests/src/bindings_tests/mod.rs similarity index 100% rename from rust/integration-tests/src/bindings_tests/mod.rs rename to taskchampion/integration-tests/src/bindings_tests/mod.rs diff --git a/rust/integration-tests/src/bindings_tests/replica.c b/taskchampion/integration-tests/src/bindings_tests/replica.c similarity index 100% rename from rust/integration-tests/src/bindings_tests/replica.c rename to taskchampion/integration-tests/src/bindings_tests/replica.c diff --git a/rust/integration-tests/src/bindings_tests/string.c b/taskchampion/integration-tests/src/bindings_tests/string.c similarity index 100% rename from rust/integration-tests/src/bindings_tests/string.c rename to taskchampion/integration-tests/src/bindings_tests/string.c diff --git a/rust/integration-tests/src/bindings_tests/task.c b/taskchampion/integration-tests/src/bindings_tests/task.c similarity index 100% rename from rust/integration-tests/src/bindings_tests/task.c rename to taskchampion/integration-tests/src/bindings_tests/task.c diff --git a/rust/integration-tests/src/bindings_tests/test.c b/taskchampion/integration-tests/src/bindings_tests/test.c similarity index 100% rename from rust/integration-tests/src/bindings_tests/test.c rename to taskchampion/integration-tests/src/bindings_tests/test.c diff --git a/rust/integration-tests/src/bindings_tests/unity/LICENSE.txt b/taskchampion/integration-tests/src/bindings_tests/unity/LICENSE.txt similarity index 100% rename from rust/integration-tests/src/bindings_tests/unity/LICENSE.txt rename to taskchampion/integration-tests/src/bindings_tests/unity/LICENSE.txt diff --git a/rust/integration-tests/src/bindings_tests/unity/README.md b/taskchampion/integration-tests/src/bindings_tests/unity/README.md similarity index 100% rename from rust/integration-tests/src/bindings_tests/unity/README.md rename to taskchampion/integration-tests/src/bindings_tests/unity/README.md diff --git a/rust/integration-tests/src/bindings_tests/unity/unity.c b/taskchampion/integration-tests/src/bindings_tests/unity/unity.c similarity index 100% rename from rust/integration-tests/src/bindings_tests/unity/unity.c rename to taskchampion/integration-tests/src/bindings_tests/unity/unity.c diff --git a/rust/integration-tests/src/bindings_tests/unity/unity.h b/taskchampion/integration-tests/src/bindings_tests/unity/unity.h similarity index 100% rename from rust/integration-tests/src/bindings_tests/unity/unity.h rename to taskchampion/integration-tests/src/bindings_tests/unity/unity.h diff --git a/rust/integration-tests/src/bindings_tests/unity/unity_internals.h b/taskchampion/integration-tests/src/bindings_tests/unity/unity_internals.h similarity index 100% rename from rust/integration-tests/src/bindings_tests/unity/unity_internals.h rename to taskchampion/integration-tests/src/bindings_tests/unity/unity_internals.h diff --git a/rust/integration-tests/src/bindings_tests/uuid.c b/taskchampion/integration-tests/src/bindings_tests/uuid.c similarity index 100% rename from rust/integration-tests/src/bindings_tests/uuid.c rename to taskchampion/integration-tests/src/bindings_tests/uuid.c diff --git a/rust/integration-tests/src/lib.rs b/taskchampion/integration-tests/src/lib.rs similarity index 100% rename from rust/integration-tests/src/lib.rs rename to taskchampion/integration-tests/src/lib.rs diff --git a/rust/integration-tests/tests/bindings.rs b/taskchampion/integration-tests/tests/bindings.rs similarity index 100% rename from rust/integration-tests/tests/bindings.rs rename to taskchampion/integration-tests/tests/bindings.rs diff --git a/rust/integration-tests/tests/cross-sync.rs b/taskchampion/integration-tests/tests/cross-sync.rs similarity index 100% rename from rust/integration-tests/tests/cross-sync.rs rename to taskchampion/integration-tests/tests/cross-sync.rs diff --git a/rust/integration-tests/tests/snapshots.rs b/taskchampion/integration-tests/tests/snapshots.rs similarity index 100% rename from rust/integration-tests/tests/snapshots.rs rename to taskchampion/integration-tests/tests/snapshots.rs diff --git a/rust/integration-tests/tests/update-and-delete-sync.rs b/taskchampion/integration-tests/tests/update-and-delete-sync.rs similarity index 100% rename from rust/integration-tests/tests/update-and-delete-sync.rs rename to taskchampion/integration-tests/tests/update-and-delete-sync.rs diff --git a/rust/lib/Cargo.toml b/taskchampion/lib/Cargo.toml similarity index 100% rename from rust/lib/Cargo.toml rename to taskchampion/lib/Cargo.toml diff --git a/rust/lib/Makefile b/taskchampion/lib/Makefile similarity index 100% rename from rust/lib/Makefile rename to taskchampion/lib/Makefile diff --git a/rust/lib/header-intro.h b/taskchampion/lib/header-intro.h similarity index 100% rename from rust/lib/header-intro.h rename to taskchampion/lib/header-intro.h diff --git a/rust/lib/src/annotation.rs b/taskchampion/lib/src/annotation.rs similarity index 100% rename from rust/lib/src/annotation.rs rename to taskchampion/lib/src/annotation.rs diff --git a/rust/lib/src/atomic.rs b/taskchampion/lib/src/atomic.rs similarity index 100% rename from rust/lib/src/atomic.rs rename to taskchampion/lib/src/atomic.rs diff --git a/rust/lib/src/kv.rs b/taskchampion/lib/src/kv.rs similarity index 100% rename from rust/lib/src/kv.rs rename to taskchampion/lib/src/kv.rs diff --git a/rust/lib/src/lib.rs b/taskchampion/lib/src/lib.rs similarity index 100% rename from rust/lib/src/lib.rs rename to taskchampion/lib/src/lib.rs diff --git a/rust/lib/src/replica.rs b/taskchampion/lib/src/replica.rs similarity index 100% rename from rust/lib/src/replica.rs rename to taskchampion/lib/src/replica.rs diff --git a/rust/lib/src/result.rs b/taskchampion/lib/src/result.rs similarity index 100% rename from rust/lib/src/result.rs rename to taskchampion/lib/src/result.rs diff --git a/rust/lib/src/server.rs b/taskchampion/lib/src/server.rs similarity index 100% rename from rust/lib/src/server.rs rename to taskchampion/lib/src/server.rs diff --git a/rust/lib/src/status.rs b/taskchampion/lib/src/status.rs similarity index 100% rename from rust/lib/src/status.rs rename to taskchampion/lib/src/status.rs diff --git a/rust/lib/src/string.rs b/taskchampion/lib/src/string.rs similarity index 100% rename from rust/lib/src/string.rs rename to taskchampion/lib/src/string.rs diff --git a/rust/lib/src/task.rs b/taskchampion/lib/src/task.rs similarity index 100% rename from rust/lib/src/task.rs rename to taskchampion/lib/src/task.rs diff --git a/rust/lib/src/traits.rs b/taskchampion/lib/src/traits.rs similarity index 100% rename from rust/lib/src/traits.rs rename to taskchampion/lib/src/traits.rs diff --git a/rust/lib/src/uda.rs b/taskchampion/lib/src/uda.rs similarity index 100% rename from rust/lib/src/uda.rs rename to taskchampion/lib/src/uda.rs diff --git a/rust/lib/src/util.rs b/taskchampion/lib/src/util.rs similarity index 100% rename from rust/lib/src/util.rs rename to taskchampion/lib/src/util.rs diff --git a/rust/lib/src/uuid.rs b/taskchampion/lib/src/uuid.rs similarity index 100% rename from rust/lib/src/uuid.rs rename to taskchampion/lib/src/uuid.rs diff --git a/rust/lib/src/workingset.rs b/taskchampion/lib/src/workingset.rs similarity index 100% rename from rust/lib/src/workingset.rs rename to taskchampion/lib/src/workingset.rs diff --git a/rust/lib/taskchampion.h b/taskchampion/lib/taskchampion.h similarity index 100% rename from rust/lib/taskchampion.h rename to taskchampion/lib/taskchampion.h diff --git a/rust/scripts/changelog.py b/taskchampion/scripts/changelog.py similarity index 100% rename from rust/scripts/changelog.py rename to taskchampion/scripts/changelog.py diff --git a/rust/sync-server/Cargo.toml b/taskchampion/sync-server/Cargo.toml similarity index 100% rename from rust/sync-server/Cargo.toml rename to taskchampion/sync-server/Cargo.toml diff --git a/rust/sync-server/src/api/add_snapshot.rs b/taskchampion/sync-server/src/api/add_snapshot.rs similarity index 100% rename from rust/sync-server/src/api/add_snapshot.rs rename to taskchampion/sync-server/src/api/add_snapshot.rs diff --git a/rust/sync-server/src/api/add_version.rs b/taskchampion/sync-server/src/api/add_version.rs similarity index 100% rename from rust/sync-server/src/api/add_version.rs rename to taskchampion/sync-server/src/api/add_version.rs diff --git a/rust/sync-server/src/api/get_child_version.rs b/taskchampion/sync-server/src/api/get_child_version.rs similarity index 100% rename from rust/sync-server/src/api/get_child_version.rs rename to taskchampion/sync-server/src/api/get_child_version.rs diff --git a/rust/sync-server/src/api/get_snapshot.rs b/taskchampion/sync-server/src/api/get_snapshot.rs similarity index 100% rename from rust/sync-server/src/api/get_snapshot.rs rename to taskchampion/sync-server/src/api/get_snapshot.rs diff --git a/rust/sync-server/src/api/mod.rs b/taskchampion/sync-server/src/api/mod.rs similarity index 100% rename from rust/sync-server/src/api/mod.rs rename to taskchampion/sync-server/src/api/mod.rs diff --git a/rust/sync-server/src/bin/taskchampion-sync-server.rs b/taskchampion/sync-server/src/bin/taskchampion-sync-server.rs similarity index 100% rename from rust/sync-server/src/bin/taskchampion-sync-server.rs rename to taskchampion/sync-server/src/bin/taskchampion-sync-server.rs diff --git a/rust/sync-server/src/lib.rs b/taskchampion/sync-server/src/lib.rs similarity index 100% rename from rust/sync-server/src/lib.rs rename to taskchampion/sync-server/src/lib.rs diff --git a/rust/sync-server/src/server.rs b/taskchampion/sync-server/src/server.rs similarity index 100% rename from rust/sync-server/src/server.rs rename to taskchampion/sync-server/src/server.rs diff --git a/rust/sync-server/src/storage/inmemory.rs b/taskchampion/sync-server/src/storage/inmemory.rs similarity index 100% rename from rust/sync-server/src/storage/inmemory.rs rename to taskchampion/sync-server/src/storage/inmemory.rs diff --git a/rust/sync-server/src/storage/mod.rs b/taskchampion/sync-server/src/storage/mod.rs similarity index 100% rename from rust/sync-server/src/storage/mod.rs rename to taskchampion/sync-server/src/storage/mod.rs diff --git a/rust/sync-server/src/storage/sqlite.rs b/taskchampion/sync-server/src/storage/sqlite.rs similarity index 100% rename from rust/sync-server/src/storage/sqlite.rs rename to taskchampion/sync-server/src/storage/sqlite.rs diff --git a/rust/taskchampion/Cargo.toml b/taskchampion/taskchampion/Cargo.toml similarity index 100% rename from rust/taskchampion/Cargo.toml rename to taskchampion/taskchampion/Cargo.toml diff --git a/rust/taskchampion/src/depmap.rs b/taskchampion/taskchampion/src/depmap.rs similarity index 100% rename from rust/taskchampion/src/depmap.rs rename to taskchampion/taskchampion/src/depmap.rs diff --git a/rust/taskchampion/src/errors.rs b/taskchampion/taskchampion/src/errors.rs similarity index 100% rename from rust/taskchampion/src/errors.rs rename to taskchampion/taskchampion/src/errors.rs diff --git a/rust/taskchampion/src/lib.rs b/taskchampion/taskchampion/src/lib.rs similarity index 100% rename from rust/taskchampion/src/lib.rs rename to taskchampion/taskchampion/src/lib.rs diff --git a/rust/taskchampion/src/macros.rs b/taskchampion/taskchampion/src/macros.rs similarity index 100% rename from rust/taskchampion/src/macros.rs rename to taskchampion/taskchampion/src/macros.rs diff --git a/rust/taskchampion/src/replica.rs b/taskchampion/taskchampion/src/replica.rs similarity index 100% rename from rust/taskchampion/src/replica.rs rename to taskchampion/taskchampion/src/replica.rs diff --git a/rust/taskchampion/src/server/config.rs b/taskchampion/taskchampion/src/server/config.rs similarity index 100% rename from rust/taskchampion/src/server/config.rs rename to taskchampion/taskchampion/src/server/config.rs diff --git a/rust/taskchampion/src/server/crypto.rs b/taskchampion/taskchampion/src/server/crypto.rs similarity index 100% rename from rust/taskchampion/src/server/crypto.rs rename to taskchampion/taskchampion/src/server/crypto.rs diff --git a/rust/taskchampion/src/server/generate-test-data.py b/taskchampion/taskchampion/src/server/generate-test-data.py similarity index 100% rename from rust/taskchampion/src/server/generate-test-data.py rename to taskchampion/taskchampion/src/server/generate-test-data.py diff --git a/rust/taskchampion/src/server/local.rs b/taskchampion/taskchampion/src/server/local.rs similarity index 100% rename from rust/taskchampion/src/server/local.rs rename to taskchampion/taskchampion/src/server/local.rs diff --git a/rust/taskchampion/src/server/mod.rs b/taskchampion/taskchampion/src/server/mod.rs similarity index 100% rename from rust/taskchampion/src/server/mod.rs rename to taskchampion/taskchampion/src/server/mod.rs diff --git a/rust/taskchampion/src/server/op.rs b/taskchampion/taskchampion/src/server/op.rs similarity index 100% rename from rust/taskchampion/src/server/op.rs rename to taskchampion/taskchampion/src/server/op.rs diff --git a/rust/taskchampion/src/server/remote/mod.rs b/taskchampion/taskchampion/src/server/remote/mod.rs similarity index 100% rename from rust/taskchampion/src/server/remote/mod.rs rename to taskchampion/taskchampion/src/server/remote/mod.rs diff --git a/rust/taskchampion/src/server/test-bad-app-id.data b/taskchampion/taskchampion/src/server/test-bad-app-id.data similarity index 100% rename from rust/taskchampion/src/server/test-bad-app-id.data rename to taskchampion/taskchampion/src/server/test-bad-app-id.data diff --git a/rust/taskchampion/src/server/test-bad-client-key.data b/taskchampion/taskchampion/src/server/test-bad-client-key.data similarity index 100% rename from rust/taskchampion/src/server/test-bad-client-key.data rename to taskchampion/taskchampion/src/server/test-bad-client-key.data diff --git a/rust/taskchampion/src/server/test-bad-secret.data b/taskchampion/taskchampion/src/server/test-bad-secret.data similarity index 100% rename from rust/taskchampion/src/server/test-bad-secret.data rename to taskchampion/taskchampion/src/server/test-bad-secret.data diff --git a/rust/taskchampion/src/server/test-bad-version-id.data b/taskchampion/taskchampion/src/server/test-bad-version-id.data similarity index 100% rename from rust/taskchampion/src/server/test-bad-version-id.data rename to taskchampion/taskchampion/src/server/test-bad-version-id.data diff --git a/rust/taskchampion/src/server/test-bad-version.data b/taskchampion/taskchampion/src/server/test-bad-version.data similarity index 100% rename from rust/taskchampion/src/server/test-bad-version.data rename to taskchampion/taskchampion/src/server/test-bad-version.data diff --git a/rust/taskchampion/src/server/test-bad-version_id.data b/taskchampion/taskchampion/src/server/test-bad-version_id.data similarity index 100% rename from rust/taskchampion/src/server/test-bad-version_id.data rename to taskchampion/taskchampion/src/server/test-bad-version_id.data diff --git a/rust/taskchampion/src/server/test-good.data b/taskchampion/taskchampion/src/server/test-good.data similarity index 100% rename from rust/taskchampion/src/server/test-good.data rename to taskchampion/taskchampion/src/server/test-good.data diff --git a/rust/taskchampion/src/server/test.rs b/taskchampion/taskchampion/src/server/test.rs similarity index 100% rename from rust/taskchampion/src/server/test.rs rename to taskchampion/taskchampion/src/server/test.rs diff --git a/rust/taskchampion/src/server/types.rs b/taskchampion/taskchampion/src/server/types.rs similarity index 100% rename from rust/taskchampion/src/server/types.rs rename to taskchampion/taskchampion/src/server/types.rs diff --git a/rust/taskchampion/src/storage/config.rs b/taskchampion/taskchampion/src/storage/config.rs similarity index 100% rename from rust/taskchampion/src/storage/config.rs rename to taskchampion/taskchampion/src/storage/config.rs diff --git a/rust/taskchampion/src/storage/inmemory.rs b/taskchampion/taskchampion/src/storage/inmemory.rs similarity index 100% rename from rust/taskchampion/src/storage/inmemory.rs rename to taskchampion/taskchampion/src/storage/inmemory.rs diff --git a/rust/taskchampion/src/storage/mod.rs b/taskchampion/taskchampion/src/storage/mod.rs similarity index 100% rename from rust/taskchampion/src/storage/mod.rs rename to taskchampion/taskchampion/src/storage/mod.rs diff --git a/rust/taskchampion/src/storage/op.rs b/taskchampion/taskchampion/src/storage/op.rs similarity index 100% rename from rust/taskchampion/src/storage/op.rs rename to taskchampion/taskchampion/src/storage/op.rs diff --git a/rust/taskchampion/src/storage/sqlite.rs b/taskchampion/taskchampion/src/storage/sqlite.rs similarity index 100% rename from rust/taskchampion/src/storage/sqlite.rs rename to taskchampion/taskchampion/src/storage/sqlite.rs diff --git a/rust/taskchampion/src/task/annotation.rs b/taskchampion/taskchampion/src/task/annotation.rs similarity index 100% rename from rust/taskchampion/src/task/annotation.rs rename to taskchampion/taskchampion/src/task/annotation.rs diff --git a/rust/taskchampion/src/task/mod.rs b/taskchampion/taskchampion/src/task/mod.rs similarity index 100% rename from rust/taskchampion/src/task/mod.rs rename to taskchampion/taskchampion/src/task/mod.rs diff --git a/rust/taskchampion/src/task/status.rs b/taskchampion/taskchampion/src/task/status.rs similarity index 100% rename from rust/taskchampion/src/task/status.rs rename to taskchampion/taskchampion/src/task/status.rs diff --git a/rust/taskchampion/src/task/tag.rs b/taskchampion/taskchampion/src/task/tag.rs similarity index 100% rename from rust/taskchampion/src/task/tag.rs rename to taskchampion/taskchampion/src/task/tag.rs diff --git a/rust/taskchampion/src/task/task.rs b/taskchampion/taskchampion/src/task/task.rs similarity index 100% rename from rust/taskchampion/src/task/task.rs rename to taskchampion/taskchampion/src/task/task.rs diff --git a/rust/taskchampion/src/taskdb/apply.rs b/taskchampion/taskchampion/src/taskdb/apply.rs similarity index 100% rename from rust/taskchampion/src/taskdb/apply.rs rename to taskchampion/taskchampion/src/taskdb/apply.rs diff --git a/rust/taskchampion/src/taskdb/mod.rs b/taskchampion/taskchampion/src/taskdb/mod.rs similarity index 100% rename from rust/taskchampion/src/taskdb/mod.rs rename to taskchampion/taskchampion/src/taskdb/mod.rs diff --git a/rust/taskchampion/src/taskdb/snapshot.rs b/taskchampion/taskchampion/src/taskdb/snapshot.rs similarity index 100% rename from rust/taskchampion/src/taskdb/snapshot.rs rename to taskchampion/taskchampion/src/taskdb/snapshot.rs diff --git a/rust/taskchampion/src/taskdb/sync.rs b/taskchampion/taskchampion/src/taskdb/sync.rs similarity index 100% rename from rust/taskchampion/src/taskdb/sync.rs rename to taskchampion/taskchampion/src/taskdb/sync.rs diff --git a/rust/taskchampion/src/taskdb/undo.rs b/taskchampion/taskchampion/src/taskdb/undo.rs similarity index 100% rename from rust/taskchampion/src/taskdb/undo.rs rename to taskchampion/taskchampion/src/taskdb/undo.rs diff --git a/rust/taskchampion/src/taskdb/working_set.rs b/taskchampion/taskchampion/src/taskdb/working_set.rs similarity index 100% rename from rust/taskchampion/src/taskdb/working_set.rs rename to taskchampion/taskchampion/src/taskdb/working_set.rs diff --git a/rust/taskchampion/src/utils.rs b/taskchampion/taskchampion/src/utils.rs similarity index 100% rename from rust/taskchampion/src/utils.rs rename to taskchampion/taskchampion/src/utils.rs diff --git a/rust/taskchampion/src/workingset.rs b/taskchampion/taskchampion/src/workingset.rs similarity index 100% rename from rust/taskchampion/src/workingset.rs rename to taskchampion/taskchampion/src/workingset.rs diff --git a/rust/xtask/Cargo.toml b/taskchampion/xtask/Cargo.toml similarity index 100% rename from rust/xtask/Cargo.toml rename to taskchampion/xtask/Cargo.toml diff --git a/rust/xtask/src/main.rs b/taskchampion/xtask/src/main.rs similarity index 100% rename from rust/xtask/src/main.rs rename to taskchampion/xtask/src/main.rs diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 75a7f601f..f17d0c750 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,7 +14,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src/columns ${CMAKE_SOURCE_DIR}/src/libshared/src ${CMAKE_SOURCE_DIR}/test - ${CMAKE_SOURCE_DIR}/rust/lib + ${CMAKE_SOURCE_DIR}/taskchampion/lib ${TASK_INCLUDE_DIRS}) set (test_SRCS col.t dom.t eval.t lexer.t t.t tw-2689.t tdb2.t tc.t util.t variant_add.t variant_and.t variant_cast.t variant_divide.t variant_equal.t variant_exp.t variant_gt.t variant_gte.t variant_inequal.t variant_lt.t variant_lte.t variant_match.t variant_math.t variant_modulo.t variant_multiply.t variant_nomatch.t variant_not.t variant_or.t variant_partial.t variant_subtract.t variant_xor.t view.t)