diff --git a/Cargo.lock b/Cargo.lock index bdb393b396..e61b032d1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2234,7 +2234,6 @@ dependencies = [ "chrono", "concurrency", "config", - "container_common", "dotenv", "easyenv", "email_sender", @@ -7783,7 +7782,7 @@ version = "0.0.1" dependencies = [ "anyhow", "chrono", - "container_common", + "errors", "log", "my-workspace-hack", "once_cell", diff --git a/crates/lib/tts_common/Cargo.toml b/crates/lib/tts_common/Cargo.toml index 83d547c5f2..e9bda29c18 100644 --- a/crates/lib/tts_common/Cargo.toml +++ b/crates/lib/tts_common/Cargo.toml @@ -18,7 +18,7 @@ normal = ["my-workspace-hack"] [dependencies] # Internal -container_common = { path = "../deprecated/container_common" } +errors = { path = "../errors" } user_input_common = { path = "../user_input_common" } # Workspace hack (faster compile times) diff --git a/crates/lib/tts_common/src/text_pipelines/text_pipeline_type.rs b/crates/lib/tts_common/src/text_pipelines/text_pipeline_type.rs index e8bc751f13..e1083ecae5 100644 --- a/crates/lib/tts_common/src/text_pipelines/text_pipeline_type.rs +++ b/crates/lib/tts_common/src/text_pipelines/text_pipeline_type.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; -use container_common::anyhow_result::AnyhowResult; +use errors::AnyhowResult; /// Text Pipelines for TTS /// The system only tolerates the following values for TTS text pipelines. diff --git a/crates/service/job/email_sender_job/Cargo.toml b/crates/service/job/email_sender_job/Cargo.toml index 53699e5397..f2b040d345 100644 --- a/crates/service/job/email_sender_job/Cargo.toml +++ b/crates/service/job/email_sender_job/Cargo.toml @@ -23,7 +23,6 @@ bootstrap = { path = "../../../lib/bootstrap" } buckets = { path = "../../../_types/buckets" } concurrency = { path = "../../../lib/concurrency" } config = { path = "../../../lib/deprecated/config" } -container_common = { path = "../../../lib/deprecated/container_common" } easyenv = { path = "../../../lib/easyenv" } email_sender = { path = "../../../lib/email_sender" } enums = { path = "../../../_types/enums" } diff --git a/crates/service/job/email_sender_job/src/main.rs b/crates/service/job/email_sender_job/src/main.rs index dbcdab70f0..917113f48e 100644 --- a/crates/service/job/email_sender_job/src/main.rs +++ b/crates/service/job/email_sender_job/src/main.rs @@ -29,8 +29,8 @@ use concurrency::relaxed_atomic_bool::RelaxedAtomicBool; use config::common_env::CommonEnv; use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; -use container_common::anyhow_result::AnyhowResult; use email_sender::smtp_email_sender::SmtpEmailSender; +use errors::AnyhowResult; use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporterBuilder; use jobs_common::job_progress_reporter::noop_job_progress_reporter::NoOpJobProgressReporterBuilder; use jobs_common::job_progress_reporter::redis_job_progress_reporter::RedisJobProgressReporterBuilder;