diff --git a/Cargo.toml b/Cargo.toml index eb0241d11b..9589ef0266 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,11 @@ [workspace] members = [ + # Types: common strongly-typed tokens, ids, payloads, etc. + "crates/_types/enums", + "crates/_types/reusable_types", # TODO(bt, 2022-12-21): Deprecate + "crates/_types/tokens", + # CLI tools for operations, etc. "crates/cli/database_backup", "crates/cli/database_cleanup", @@ -27,11 +32,6 @@ members = [ "crates/lib/url_config", "crates/lib/user_input_common", - # Types: common strongly-typed tokens, ids, payloads, etc. - "crates/types/enums", - "crates/types/reusable_types", # TODO(bt, 2022-12-21): Deprecate - "crates/types/tokens", - # Services: API servers, jobs, workers, etc. "crates/service/job/download_job", "crates/service/job/inference_job", diff --git a/crates/types/enums/Cargo.toml b/crates/_types/enums/Cargo.toml similarity index 100% rename from crates/types/enums/Cargo.toml rename to crates/_types/enums/Cargo.toml diff --git a/crates/types/enums/src/core/mod.rs b/crates/_types/enums/src/core/mod.rs similarity index 100% rename from crates/types/enums/src/core/mod.rs rename to crates/_types/enums/src/core/mod.rs diff --git a/crates/types/enums/src/core/visibility.rs b/crates/_types/enums/src/core/visibility.rs similarity index 100% rename from crates/types/enums/src/core/visibility.rs rename to crates/_types/enums/src/core/visibility.rs diff --git a/crates/types/enums/src/files/media_upload_type.rs b/crates/_types/enums/src/files/media_upload_type.rs similarity index 100% rename from crates/types/enums/src/files/media_upload_type.rs rename to crates/_types/enums/src/files/media_upload_type.rs diff --git a/crates/types/enums/src/files/mod.rs b/crates/_types/enums/src/files/mod.rs similarity index 100% rename from crates/types/enums/src/files/mod.rs rename to crates/_types/enums/src/files/mod.rs diff --git a/crates/types/enums/src/lib.rs b/crates/_types/enums/src/lib.rs similarity index 100% rename from crates/types/enums/src/lib.rs rename to crates/_types/enums/src/lib.rs diff --git a/crates/types/enums/src/macros.rs b/crates/_types/enums/src/macros.rs similarity index 100% rename from crates/types/enums/src/macros.rs rename to crates/_types/enums/src/macros.rs diff --git a/crates/types/enums/src/test_helpers.rs b/crates/_types/enums/src/test_helpers.rs similarity index 100% rename from crates/types/enums/src/test_helpers.rs rename to crates/_types/enums/src/test_helpers.rs diff --git a/crates/types/reusable_types/Cargo.toml b/crates/_types/reusable_types/Cargo.toml similarity index 100% rename from crates/types/reusable_types/Cargo.toml rename to crates/_types/reusable_types/Cargo.toml diff --git a/crates/types/reusable_types/src/achievements/mod.rs b/crates/_types/reusable_types/src/achievements/mod.rs similarity index 100% rename from crates/types/reusable_types/src/achievements/mod.rs rename to crates/_types/reusable_types/src/achievements/mod.rs diff --git a/crates/types/reusable_types/src/achievements/user_badge.rs b/crates/_types/reusable_types/src/achievements/user_badge.rs similarity index 100% rename from crates/types/reusable_types/src/achievements/user_badge.rs rename to crates/_types/reusable_types/src/achievements/user_badge.rs diff --git a/crates/types/reusable_types/src/achievements/user_badge_type.rs b/crates/_types/reusable_types/src/achievements/user_badge_type.rs similarity index 100% rename from crates/types/reusable_types/src/achievements/user_badge_type.rs rename to crates/_types/reusable_types/src/achievements/user_badge_type.rs diff --git a/crates/types/reusable_types/src/db/enums/generic_download_type.rs b/crates/_types/reusable_types/src/db/enums/generic_download_type.rs similarity index 100% rename from crates/types/reusable_types/src/db/enums/generic_download_type.rs rename to crates/_types/reusable_types/src/db/enums/generic_download_type.rs diff --git a/crates/types/reusable_types/src/db/enums/generic_inference_type.rs b/crates/_types/reusable_types/src/db/enums/generic_inference_type.rs similarity index 100% rename from crates/types/reusable_types/src/db/enums/generic_inference_type.rs rename to crates/_types/reusable_types/src/db/enums/generic_inference_type.rs diff --git a/crates/types/reusable_types/src/db/enums/mod.rs b/crates/_types/reusable_types/src/db/enums/mod.rs similarity index 100% rename from crates/types/reusable_types/src/db/enums/mod.rs rename to crates/_types/reusable_types/src/db/enums/mod.rs diff --git a/crates/types/reusable_types/src/db/enums/vocoder_type.rs b/crates/_types/reusable_types/src/db/enums/vocoder_type.rs similarity index 100% rename from crates/types/reusable_types/src/db/enums/vocoder_type.rs rename to crates/_types/reusable_types/src/db/enums/vocoder_type.rs diff --git a/crates/types/reusable_types/src/db/mod.rs b/crates/_types/reusable_types/src/db/mod.rs similarity index 100% rename from crates/types/reusable_types/src/db/mod.rs rename to crates/_types/reusable_types/src/db/mod.rs diff --git a/crates/types/reusable_types/src/db/payloads/media_upload_details.rs b/crates/_types/reusable_types/src/db/payloads/media_upload_details.rs similarity index 100% rename from crates/types/reusable_types/src/db/payloads/media_upload_details.rs rename to crates/_types/reusable_types/src/db/payloads/media_upload_details.rs diff --git a/crates/types/reusable_types/src/db/payloads/mod.rs b/crates/_types/reusable_types/src/db/payloads/mod.rs similarity index 100% rename from crates/types/reusable_types/src/db/payloads/mod.rs rename to crates/_types/reusable_types/src/db/payloads/mod.rs diff --git a/crates/types/reusable_types/src/lib.rs b/crates/_types/reusable_types/src/lib.rs similarity index 100% rename from crates/types/reusable_types/src/lib.rs rename to crates/_types/reusable_types/src/lib.rs diff --git a/crates/types/reusable_types/src/server_environment.rs b/crates/_types/reusable_types/src/server_environment.rs similarity index 100% rename from crates/types/reusable_types/src/server_environment.rs rename to crates/_types/reusable_types/src/server_environment.rs diff --git a/crates/types/reusable_types/src/stripe/mod.rs b/crates/_types/reusable_types/src/stripe/mod.rs similarity index 100% rename from crates/types/reusable_types/src/stripe/mod.rs rename to crates/_types/reusable_types/src/stripe/mod.rs diff --git a/crates/types/reusable_types/src/stripe/stripe_recurring_interval.rs b/crates/_types/reusable_types/src/stripe/stripe_recurring_interval.rs similarity index 100% rename from crates/types/reusable_types/src/stripe/stripe_recurring_interval.rs rename to crates/_types/reusable_types/src/stripe/stripe_recurring_interval.rs diff --git a/crates/types/reusable_types/src/stripe/stripe_subscription_status.rs b/crates/_types/reusable_types/src/stripe/stripe_subscription_status.rs similarity index 100% rename from crates/types/reusable_types/src/stripe/stripe_subscription_status.rs rename to crates/_types/reusable_types/src/stripe/stripe_subscription_status.rs diff --git a/crates/types/reusable_types/src/test_helpers.rs b/crates/_types/reusable_types/src/test_helpers.rs similarity index 100% rename from crates/types/reusable_types/src/test_helpers.rs rename to crates/_types/reusable_types/src/test_helpers.rs diff --git a/crates/types/tokens/Cargo.toml b/crates/_types/tokens/Cargo.toml similarity index 100% rename from crates/types/tokens/Cargo.toml rename to crates/_types/tokens/Cargo.toml diff --git a/crates/types/tokens/src/files/media_upload.rs b/crates/_types/tokens/src/files/media_upload.rs similarity index 100% rename from crates/types/tokens/src/files/media_upload.rs rename to crates/_types/tokens/src/files/media_upload.rs diff --git a/crates/types/tokens/src/files/mod.rs b/crates/_types/tokens/src/files/mod.rs similarity index 100% rename from crates/types/tokens/src/files/mod.rs rename to crates/_types/tokens/src/files/mod.rs diff --git a/crates/types/tokens/src/jobs/download.rs b/crates/_types/tokens/src/jobs/download.rs similarity index 100% rename from crates/types/tokens/src/jobs/download.rs rename to crates/_types/tokens/src/jobs/download.rs diff --git a/crates/types/tokens/src/jobs/inference.rs b/crates/_types/tokens/src/jobs/inference.rs similarity index 100% rename from crates/types/tokens/src/jobs/inference.rs rename to crates/_types/tokens/src/jobs/inference.rs diff --git a/crates/types/tokens/src/jobs/mod.rs b/crates/_types/tokens/src/jobs/mod.rs similarity index 100% rename from crates/types/tokens/src/jobs/mod.rs rename to crates/_types/tokens/src/jobs/mod.rs diff --git a/crates/types/tokens/src/lib.rs b/crates/_types/tokens/src/lib.rs similarity index 100% rename from crates/types/tokens/src/lib.rs rename to crates/_types/tokens/src/lib.rs diff --git a/crates/types/tokens/src/macros.rs b/crates/_types/tokens/src/macros.rs similarity index 100% rename from crates/types/tokens/src/macros.rs rename to crates/_types/tokens/src/macros.rs diff --git a/crates/types/tokens/src/prefixes.rs b/crates/_types/tokens/src/prefixes.rs similarity index 100% rename from crates/types/tokens/src/prefixes.rs rename to crates/_types/tokens/src/prefixes.rs diff --git a/crates/types/tokens/src/users/mod.rs b/crates/_types/tokens/src/users/mod.rs similarity index 100% rename from crates/types/tokens/src/users/mod.rs rename to crates/_types/tokens/src/users/mod.rs diff --git a/crates/types/tokens/src/users/user.rs b/crates/_types/tokens/src/users/user.rs similarity index 100% rename from crates/types/tokens/src/users/user.rs rename to crates/_types/tokens/src/users/user.rs diff --git a/crates/types/tokens/src/voice_conversion/mod.rs b/crates/_types/tokens/src/voice_conversion/mod.rs similarity index 100% rename from crates/types/tokens/src/voice_conversion/mod.rs rename to crates/_types/tokens/src/voice_conversion/mod.rs diff --git a/crates/types/tokens/src/voice_conversion/model.rs b/crates/_types/tokens/src/voice_conversion/model.rs similarity index 100% rename from crates/types/tokens/src/voice_conversion/model.rs rename to crates/_types/tokens/src/voice_conversion/model.rs diff --git a/crates/types/tokens/tests/user_token_tests.rs b/crates/_types/tokens/tests/user_token_tests.rs similarity index 100% rename from crates/types/tokens/tests/user_token_tests.rs rename to crates/_types/tokens/tests/user_token_tests.rs diff --git a/crates/lib/database_queries/Cargo.toml b/crates/lib/database_queries/Cargo.toml index 1e9854bd09..17f0537c4a 100644 --- a/crates/lib/database_queries/Cargo.toml +++ b/crates/lib/database_queries/Cargo.toml @@ -17,9 +17,9 @@ path = "src/lib.rs" # Internal config = { path = "../config" } container_common = { path = "../container_common" } -enums = { path = "../../types/enums" } -reusable_types = { path = "../../types/reusable_types" } -tokens = { path = "../../types/tokens" } +enums = { path = "../../_types/enums" } +reusable_types = { path = "../../_types/reusable_types" } +tokens = { path = "../../_types/tokens" } # External anyhow = "1.0.40" diff --git a/crates/lib/http_server_common/Cargo.toml b/crates/lib/http_server_common/Cargo.toml index c570de11d5..10554fd2a9 100644 --- a/crates/lib/http_server_common/Cargo.toml +++ b/crates/lib/http_server_common/Cargo.toml @@ -16,7 +16,7 @@ path = "src/lib.rs" # Internal container_common = { path = "../container_common" } -reusable_types = { path = "../../types/reusable_types" } +reusable_types = { path = "../../_types/reusable_types" } # External anyhow = "1.0.40" diff --git a/crates/lib/url_config/Cargo.toml b/crates/lib/url_config/Cargo.toml index 88bad19e0e..11f643a027 100644 --- a/crates/lib/url_config/Cargo.toml +++ b/crates/lib/url_config/Cargo.toml @@ -16,7 +16,7 @@ path = "src/lib.rs" # Internal http_server_common = { path = "../../lib/http_server_common" } -reusable_types = { path = "../../types/reusable_types" } +reusable_types = { path = "../../_types/reusable_types" } # External actix-web = "4.0.0-beta.10" diff --git a/crates/plugins/billing/Cargo.toml b/crates/plugins/billing/Cargo.toml index ed92473329..dae42be476 100644 --- a/crates/plugins/billing/Cargo.toml +++ b/crates/plugins/billing/Cargo.toml @@ -18,7 +18,7 @@ path = "src/lib.rs" container_common = { path = "../../lib/container_common" } database_queries = { path = "../../lib/database_queries" } http_server_common = { path = "../../lib/http_server_common" } -reusable_types = { path = "../../types/reusable_types" } +reusable_types = { path = "../../_types/reusable_types" } url_config = { path = "../../lib/url_config" } # External diff --git a/crates/plugins/users/Cargo.toml b/crates/plugins/users/Cargo.toml index a072e348bf..d798745426 100644 --- a/crates/plugins/users/Cargo.toml +++ b/crates/plugins/users/Cargo.toml @@ -17,10 +17,10 @@ path = "src/lib.rs" # Internal container_common = { path = "../../lib/container_common" } database_queries = { path = "../../lib/database_queries" } -enums = { path = "../../types/enums" } +enums = { path = "../../_types/enums" } http_server_common = { path = "../../lib/http_server_common" } -reusable_types = { path = "../../types/reusable_types" } -tokens = { path = "../../types/tokens" } +reusable_types = { path = "../../_types/reusable_types" } +tokens = { path = "../../_types/tokens" } user_input_common = { path = "../../lib/user_input_common" } # External diff --git a/crates/service/job/download_job/Cargo.toml b/crates/service/job/download_job/Cargo.toml index 39196b6692..486b65038e 100644 --- a/crates/service/job/download_job/Cargo.toml +++ b/crates/service/job/download_job/Cargo.toml @@ -18,10 +18,10 @@ path = "src/main.rs" config = { path = "../../../lib/config" } container_common = { path = "../../../lib/container_common" } database_queries = { path = "../../../lib/database_queries" } -enums = { path = "../../../types/enums" } +enums = { path = "../../../_types/enums" } google_drive_common = { path = "../../../lib/google_drive_common" } jobs_common = { path = "../../../lib/jobs_common" } -reusable_types = { path = "../../../types/reusable_types" } +reusable_types = { path = "../../../_types/reusable_types" } storage_buckets_common = { path = "../../../lib/storage_buckets_common" } subprocess_common = { path = "../../../lib/subprocess_common" } tts_common = { path = "../../../lib/tts_common" } diff --git a/crates/service/web/image_generation_service/Cargo.toml b/crates/service/web/image_generation_service/Cargo.toml index 9cca2972e2..2b2a7a51bb 100644 --- a/crates/service/web/image_generation_service/Cargo.toml +++ b/crates/service/web/image_generation_service/Cargo.toml @@ -24,7 +24,7 @@ http_server_common = { path = "../../../lib/http_server_common" } jobs_common = { path = "../../../lib/jobs_common" } memory_caching = { path = "../../../lib/memory_caching" } redis_common = { path = "../../../lib/redis_common" } -reusable_types = { path = "../../../types/reusable_types" } +reusable_types = { path = "../../../_types/reusable_types" } storage_buckets_common = { path = "../../../lib/storage_buckets_common" } tts_common = { path = "../../../lib/tts_common" } twitch_common = { path = "../../../lib/twitch_common" } diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index da0f5abf30..a27b0cbc9a 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -19,16 +19,16 @@ path = "src/main.rs" config = { path = "../../../lib/config" } container_common = { path = "../../../lib/container_common" } database_queries = { path = "../../../lib/database_queries" } -enums = { path = "../../../types/enums" } +enums = { path = "../../../_types/enums" } files_common = { path = "../../../lib/files_common" } google_drive_common = { path = "../../../lib/google_drive_common" } http_server_common = { path = "../../../lib/http_server_common" } jobs_common = { path = "../../../lib/jobs_common" } memory_caching = { path = "../../../lib/memory_caching" } redis_common = { path = "../../../lib/redis_common" } -reusable_types = { path = "../../../types/reusable_types" } +reusable_types = { path = "../../../_types/reusable_types" } storage_buckets_common = { path = "../../../lib/storage_buckets_common" } -tokens = { path = "../../../types/tokens" } +tokens = { path = "../../../_types/tokens" } tts_common = { path = "../../../lib/tts_common" } twitch_common = { path = "../../../lib/twitch_common" } url_config = { path = "../../../lib/url_config" }