diff --git a/crates/_types/buckets/src/public/media_uploads/directory.rs b/crates/_types/buckets/src/public/media_uploads/directory.rs index 0b713b543..b6ba0612f 100644 --- a/crates/_types/buckets/src/public/media_uploads/directory.rs +++ b/crates/_types/buckets/src/public/media_uploads/directory.rs @@ -5,7 +5,7 @@ use crockford::crockford_entropy_lower; // TODO: Generate these from a macro. // TODO: Use a central path registry for quick reference -const MEDIA_UPLOAD_DIRECTORY : &'static str = "/media_upload"; +const MEDIA_UPLOAD_DIRECTORY : &str = "/media_upload"; /// Directory for user media uploads. /// Each uploaded file gets its own directory so that we can store the original diff --git a/crates/_types/buckets/src/public/media_uploads/original_file.rs b/crates/_types/buckets/src/public/media_uploads/original_file.rs index db5bc56cb..3d0131f1a 100644 --- a/crates/_types/buckets/src/public/media_uploads/original_file.rs +++ b/crates/_types/buckets/src/public/media_uploads/original_file.rs @@ -3,7 +3,7 @@ use crate::public::public_path::PublicPath; use crockford::crockford_entropy_lower; use std::path::PathBuf; -const ORIGINAL_FILE_BASENAME : &'static str = "original_upload.bin"; +const ORIGINAL_FILE_BASENAME : &str = "original_upload.bin"; // TODO: Generate these from a macro. diff --git a/crates/_types/buckets/src/public/voice_conversion_results/directory.rs b/crates/_types/buckets/src/public/voice_conversion_results/directory.rs index 30b0b009e..c853cf2d2 100644 --- a/crates/_types/buckets/src/public/voice_conversion_results/directory.rs +++ b/crates/_types/buckets/src/public/voice_conversion_results/directory.rs @@ -4,7 +4,7 @@ use crate::util::hashed_directory_path_long_string::hashed_directory_path_long_s // TODO: Generate these from a macro. // TODO: Use a central path registry for quick reference -const DIRECTORY: &'static str = "/voice_conversion"; +const DIRECTORY: &str = "/voice_conversion"; /// Directory for voice conversion results. /// Each result gets its own directory so that we can store the result diff --git a/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs b/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs index e4607d72b..344af8434 100644 --- a/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs +++ b/crates/_types/buckets/src/public/voice_conversion_results/original_file.rs @@ -3,8 +3,8 @@ use crate::public::voice_conversion_results::directory::VoiceConversionResultDir use crockford::crockford_entropy_lower; use std::path::PathBuf; -const ORIGINAL_FILE_PREFIX : &'static str = "fakeyou_"; -const ORIGINAL_FILE_SUFFIX : &'static str = ".wav"; +const ORIGINAL_FILE_PREFIX : &str = "fakeyou_"; +const ORIGINAL_FILE_SUFFIX : &str = ".wav"; // TODO: Generate these from a macro. diff --git a/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs b/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs index 80a7b1754..34e14d6d5 100644 --- a/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs +++ b/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs @@ -9,8 +9,8 @@ use std::sync::Arc; use std::time::Duration; use log::{error, warn}; -const AUTHORIZATION_HEADER: &'static str = "Authorization"; -const SESSION_COOKIE_NAME : &'static str = "session"; +const AUTHORIZATION_HEADER: &str = "Authorization"; +const SESSION_COOKIE_NAME : &str = "session"; /// A client to consume FakeYou's API via API sessions (vs user sessions). pub struct FakeYouApiClient { diff --git a/crates/lib/bootstrap/src/bootstrap.rs b/crates/lib/bootstrap/src/bootstrap.rs index 034e72ca8..62e2b311f 100644 --- a/crates/lib/bootstrap/src/bootstrap.rs +++ b/crates/lib/bootstrap/src/bootstrap.rs @@ -40,7 +40,7 @@ pub struct ContainerEnvironment { } /// Environment variable for server environment. -const SERVER_ENVIRONMENT : &'static str = "SERVER_ENVIRONMENT"; +const SERVER_ENVIRONMENT : &str = "SERVER_ENVIRONMENT"; pub fn bootstrap>(args: BootstrapArgs<'_, P>) -> AnyhowResult { easyenv::init_all_with_default_logging(args.default_logging_override); diff --git a/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs b/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs index 5daeee08b..ebcfced12 100644 --- a/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs +++ b/crates/lib/caching/memory_caching/src/single_item_ttl_cache.rs @@ -5,7 +5,7 @@ use std::sync::{Arc, Mutex}; use std::time::Duration; /// NB: There's only ONE ITEM of ONE TYPE in the cache. We can use a single key. -const CACHE_KEY : &'static str = "ITEM"; +const CACHE_KEY : &str = "ITEM"; /// Store a single payload in the cache /// There's only ONE ITEM of ONE TYPE in the cache. diff --git a/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs b/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs index 86d2d88ba..3449cf2c0 100644 --- a/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs +++ b/crates/lib/caching/redis_caching/src/redis_ttl_cache.rs @@ -7,7 +7,7 @@ use errors::AnyhowResult; const DEFAULT_TTL_SECONDS : usize = 60; -const REDIS_KEY_PREFIX : &'static str = "_c"; +const REDIS_KEY_PREFIX : &str = "_c"; // TODO: Async Redis diff --git a/crates/lib/deprecated/config/src/shared_constants.rs b/crates/lib/deprecated/config/src/shared_constants.rs index 1b5a4102d..a963168cf 100644 --- a/crates/lib/deprecated/config/src/shared_constants.rs +++ b/crates/lib/deprecated/config/src/shared_constants.rs @@ -3,7 +3,7 @@ /// NB: `sqlx::query` is spammy and dumps all queries as "info"-level log lines. /// NB: `hyper::proto::h1::io` is incredibly spammy and logs every chunk of bytes in very large files being downloaded. -pub const DEFAULT_RUST_LOG: &'static str = concat!( +pub const DEFAULT_RUST_LOG: &str = concat!( "debug,", "actix_web=info,", "sqlx::query=warn,", @@ -13,14 +13,14 @@ pub const DEFAULT_RUST_LOG: &'static str = concat!( ); /// The default Redis connection string for use in development -pub const DEFAULT_REDIS_DATABASE_0_CONNECTION_STRING: &'static str = "redis://localhost/0"; +pub const DEFAULT_REDIS_DATABASE_0_CONNECTION_STRING: &str = "redis://localhost/0"; /// The default Redis connection string for use in development /// Database 1 -pub const DEFAULT_REDIS_DATABASE_1_CONNECTION_STRING: &'static str = "redis://localhost/1"; +pub const DEFAULT_REDIS_DATABASE_1_CONNECTION_STRING: &str = "redis://localhost/1"; /// The default MySql connection string for use in development -pub const DEFAULT_MYSQL_CONNECTION_STRING: &'static str = "mysql://storyteller:password@localhost/storyteller"; +pub const DEFAULT_MYSQL_CONNECTION_STRING: &str = "mysql://storyteller:password@localhost/storyteller"; /// The number of results we return by default for paginated queries. pub const DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE: u16 = 25; diff --git a/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs b/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs index 1ee887ddc..663d63fbc 100644 --- a/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs +++ b/crates/lib/deprecated/http_server_common/src/request/get_request_api_token.rs @@ -1,7 +1,7 @@ use actix_web::HttpRequest; use crate::request::get_request_header_optional::get_request_header_optional; -const API_TOKEN_HEADER : &'static str = "AUTHORIZATION"; +const API_TOKEN_HEADER : &str = "AUTHORIZATION"; /// Get the optional API token sent with the request pub fn get_request_api_token(request: &HttpRequest) -> Option { diff --git a/crates/lib/files/mimetypes/src/mimetype_for_bytes.rs b/crates/lib/files/mimetypes/src/mimetype_for_bytes.rs index b71ab972d..66cf9bc4b 100644 --- a/crates/lib/files/mimetypes/src/mimetype_for_bytes.rs +++ b/crates/lib/files/mimetypes/src/mimetype_for_bytes.rs @@ -1,5 +1,5 @@ -const DEFAULT_BINARY_MIMETYPE : &'static str = "application/octet-stream"; +const DEFAULT_BINARY_MIMETYPE : &str = "application/octet-stream"; pub fn get_mimetype_for_bytes(bytes: &[u8]) -> Option<&'static str> { infer::get(bytes) diff --git a/crates/lib/files/mimetypes/src/mimetype_for_file.rs b/crates/lib/files/mimetypes/src/mimetype_for_file.rs index 75576ca7b..552b950f8 100644 --- a/crates/lib/files/mimetypes/src/mimetype_for_file.rs +++ b/crates/lib/files/mimetypes/src/mimetype_for_file.rs @@ -1,6 +1,6 @@ use std::path::Path; -const DEFAULT_BINARY_MIMETYPE : &'static str = "application/octet-stream"; +const DEFAULT_BINARY_MIMETYPE : &str = "application/octet-stream"; pub fn get_mimetype_for_file>(file: P) -> std::io::Result> { infer::get_from_path(file) diff --git a/crates/lib/mysql_queries/src/queries/users/user/create_account.rs b/crates/lib/mysql_queries/src/queries/users/user/create_account.rs index d28f70107..2e40964de 100644 --- a/crates/lib/mysql_queries/src/queries/users/user/create_account.rs +++ b/crates/lib/mysql_queries/src/queries/users/user/create_account.rs @@ -34,9 +34,9 @@ pub async fn create_account( args: CreateAccountArgs<'_>, ) -> Result { - const INITIAL_PROFILE_MARKDOWN : &'static str = ""; - const INITIAL_PROFILE_RENDERED_HTML : &'static str = ""; - const INITIAL_USER_ROLE: &'static str = "user"; + const INITIAL_PROFILE_MARKDOWN : &str = ""; + const INITIAL_PROFILE_RENDERED_HTML : &str = ""; + const INITIAL_USER_ROLE: &str = "user"; let user_token = Tokens::new_user() .map_err(|_e| { diff --git a/crates/lib/tts_common/src/clean_symbols.rs b/crates/lib/tts_common/src/clean_symbols.rs index f73bf28f2..2351222dd 100644 --- a/crates/lib/tts_common/src/clean_symbols.rs +++ b/crates/lib/tts_common/src/clean_symbols.rs @@ -173,7 +173,7 @@ mod tests { use once_cell::sync::Lazy; use crate::clean_symbols::clean_symbols; - const TIME_BOMB_EPOCH_STR : &'static str = "2023-11-01T00:00:00.00Z"; + const TIME_BOMB_EPOCH_STR : &str = "2023-11-01T00:00:00.00Z"; static TIME_BOMB_EPOCH: Lazy> = Lazy::new(|| { let datetime = DateTime::parse_from_rfc3339(TIME_BOMB_EPOCH_STR) diff --git a/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs b/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs index f45a01dc6..e94f075f6 100644 --- a/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs +++ b/crates/lib/tts_common/src/text_pipelines/guess_pipeline.rs @@ -4,7 +4,7 @@ use once_cell::sync::Lazy; use crate::text_pipelines::text_pipeline_type::TextPipelineType; // TODO: This is not yet popularized -const ENGLISH_V1_EPOCH_STR : &'static str = "2023-01-01T00:00:00.00Z"; +const ENGLISH_V1_EPOCH_STR : &str = "2023-01-01T00:00:00.00Z"; /// Date we consider to switch models to "english_v1" instead of "legacy_fakeyou" static ENGLISH_V1_EPOCH : Lazy> = Lazy::new(|| { 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 12884df0c..f587746d5 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 @@ -47,11 +47,11 @@ pub enum TextPipelineType { } // TODO: Sucks to redefine enum variants. `serde_variant` looks like a fix, but it's GPL3. -const LEGACY_FAKEYOU : &'static str = "legacy_fakeyou"; -const ENGLISH_V1 : &'static str = "english_v1"; -const SPANISH_V1 : &'static str = "spanish_v1"; -const SPANISH_V2 : &'static str = "spanish_v2"; -const SYNTHETIC_LEGACY_FAKEYOU_2 : &'static str = "legacy_fakeyou_2"; +const LEGACY_FAKEYOU : &str = "legacy_fakeyou"; +const ENGLISH_V1 : &str = "english_v1"; +const SPANISH_V1 : &str = "spanish_v1"; +const SPANISH_V2 : &str = "spanish_v2"; +const SYNTHETIC_LEGACY_FAKEYOU_2 : &str = "legacy_fakeyou_2"; impl TextPipelineType { diff --git a/crates/lib/user_input_common/src/lib.rs b/crates/lib/user_input_common/src/lib.rs index 8482d05c9..9f227b3a0 100644 --- a/crates/lib/user_input_common/src/lib.rs +++ b/crates/lib/user_input_common/src/lib.rs @@ -7,7 +7,7 @@ #![forbid(unused_variables)] #![forbid(warnings)] -pub (crate) const BANNED_SLURS : &'static str = include_str!("../../../../includes/binary_includes/banned_slurs.txt"); +pub (crate) const BANNED_SLURS : &str = include_str!("../../../../includes/binary_includes/banned_slurs.txt"); pub mod check_for_slurs; pub mod latin_alphabet; diff --git a/crates/lib/web_scrapers/src/sites/cnn/cnn_indexer.rs b/crates/lib/web_scrapers/src/sites/cnn/cnn_indexer.rs index b8771af7c..abdf58985 100644 --- a/crates/lib/web_scrapers/src/sites/cnn/cnn_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/cnn/cnn_indexer.rs @@ -6,15 +6,15 @@ use log::warn; use rss::Channel; // NB: Contains nearly 70 items -const RSS_TOP_STORIES : &'static str = "http://rss.cnn.com/rss/cnn_topstories.rss"; +const RSS_TOP_STORIES : &str = "http://rss.cnn.com/rss/cnn_topstories.rss"; -const RSS_WORLD : &'static str = "http://rss.cnn.com/rss/cnn_world.rss"; +const RSS_WORLD : &str = "http://rss.cnn.com/rss/cnn_world.rss"; -const RSS_US : &'static str = "http://rss.cnn.com/rss/cnn_us.rss"; +const RSS_US : &str = "http://rss.cnn.com/rss/cnn_us.rss"; -const RSS_TECH : &'static str = "http://rss.cnn.com/rss/cnn_tech.rss"; +const RSS_TECH : &str = "http://rss.cnn.com/rss/cnn_tech.rss"; -const RSS_ENTERTAINMENT : &'static str = "http://rss.cnn.com/rss/cnn_showbiz.rss"; +const RSS_ENTERTAINMENT : &str = "http://rss.cnn.com/rss/cnn_showbiz.rss"; #[derive(Copy, Clone, Debug, EnumIter, EnumCount)] pub enum CnnFeed { diff --git a/crates/lib/web_scrapers/src/sites/gizmodo/gizmodo_indexer.rs b/crates/lib/web_scrapers/src/sites/gizmodo/gizmodo_indexer.rs index 8bee66ded..619f06c85 100644 --- a/crates/lib/web_scrapers/src/sites/gizmodo/gizmodo_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/gizmodo/gizmodo_indexer.rs @@ -5,7 +5,7 @@ use errors::AnyhowResult; use log::warn; use rss::Channel; -const GIZMODO_RSS : &'static str = "https://gizmodo.com/rss"; +const GIZMODO_RSS : &str = "https://gizmodo.com/rss"; // TODO: Rename foo_feed() or foo_rss(), etc. pub async fn gizmodo_indexer() -> AnyhowResult> { diff --git a/crates/lib/web_scrapers/src/sites/kotaku/kotaku_indexer.rs b/crates/lib/web_scrapers/src/sites/kotaku/kotaku_indexer.rs index 58f1ddb16..8cb377bb0 100644 --- a/crates/lib/web_scrapers/src/sites/kotaku/kotaku_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/kotaku/kotaku_indexer.rs @@ -5,7 +5,7 @@ use errors::AnyhowResult; use log::warn; use rss::Channel; -const KOTAKU_RSS: &'static str = "https://kotaku.com/rss"; +const KOTAKU_RSS: &str = "https://kotaku.com/rss"; // TODO: Rename foo_feed() or foo_rss(), etc. pub async fn kotaku_indexer() -> AnyhowResult> { diff --git a/crates/lib/web_scrapers/src/sites/techcrunch/techcrunch_indexer.rs b/crates/lib/web_scrapers/src/sites/techcrunch/techcrunch_indexer.rs index c5d77d1f2..e13b353df 100644 --- a/crates/lib/web_scrapers/src/sites/techcrunch/techcrunch_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/techcrunch/techcrunch_indexer.rs @@ -7,11 +7,11 @@ use rss::Channel; use std::ops::Deref; // NB: Feed contains ~20 items. -const MAIN_RSS_FEED : &'static str = "https://techcrunch.com/feed/"; +const MAIN_RSS_FEED : &str = "https://techcrunch.com/feed/"; -const VENTURE_FEED : &'static str = "https://techcrunch.com/category/venture/feed/"; +const VENTURE_FEED : &str = "https://techcrunch.com/category/venture/feed/"; -const STARTUPS_FEED : &'static str = "https://techcrunch.com/category/startups/feed/"; +const STARTUPS_FEED : &str = "https://techcrunch.com/category/startups/feed/"; #[derive(Copy, Clone, Debug, EnumIter, EnumCount)] pub enum TechcrunchFeed { diff --git a/crates/lib/web_scrapers/src/sites/theguardian/theguardian_indexer.rs b/crates/lib/web_scrapers/src/sites/theguardian/theguardian_indexer.rs index 019185e79..748bbf04b 100644 --- a/crates/lib/web_scrapers/src/sites/theguardian/theguardian_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/theguardian/theguardian_indexer.rs @@ -4,9 +4,9 @@ use errors::AnyhowResult; use log::warn; use rss::Channel; -const RSS_WORLD_NEWS : &'static str = "https://www.theguardian.com/world/rss"; +const RSS_WORLD_NEWS : &str = "https://www.theguardian.com/world/rss"; -const RSS_TECHNOLOGY : &'static str = "https://www.theguardian.com/technology/rss"; +const RSS_TECHNOLOGY : &str = "https://www.theguardian.com/technology/rss"; // TODO: This hasn't been tested. diff --git a/crates/programs/aichatbot-sidecar/src/main.rs b/crates/programs/aichatbot-sidecar/src/main.rs index 9d31291e8..814abea37 100644 --- a/crates/programs/aichatbot-sidecar/src/main.rs +++ b/crates/programs/aichatbot-sidecar/src/main.rs @@ -51,7 +51,7 @@ use web_scrapers::sites::techcrunch::techcrunch_article_scraper::techcrunch_arti use workers::news_stories::phase_4::news_story_audio_final_verification::main_loop::news_story_audio_final_verification_main_loop; use workers::news_stories::phase_5::news_story_post_production_finalization::main_loop::news_story_post_production_finalization_main_loop; -pub const LOG_LEVEL: &'static str = concat!( +pub const LOG_LEVEL: &str = concat!( "info,", "actix_web=info,", "symphonia_core=warn,", // Symphonia is spammy af. diff --git a/crates/programs/aichatbot-sidecar/src/startup_args.rs b/crates/programs/aichatbot-sidecar/src/startup_args.rs index 8ad251313..87e1c55f2 100644 --- a/crates/programs/aichatbot-sidecar/src/startup_args.rs +++ b/crates/programs/aichatbot-sidecar/src/startup_args.rs @@ -4,7 +4,7 @@ use log::info; use path_absolutize::Absolutize; use errors::{anyhow, AnyhowResult}; -const DEFAULT_SAVE_DIRECTORY : &'static str = "runtime_data"; +const DEFAULT_SAVE_DIRECTORY : &str = "runtime_data"; #[derive(Clone, Default)] pub struct StartupArgs { diff --git a/crates/service/job/download_job/src/main.rs b/crates/service/job/download_job/src/main.rs index 78fdbb3ed..0045fa913 100644 --- a/crates/service/job/download_job/src/main.rs +++ b/crates/service/job/download_job/src/main.rs @@ -60,13 +60,13 @@ use subprocess_common::docker_options::{DockerFilesystemMount, DockerGpu, Docker use tokio::runtime::Runtime; // Buckets -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; -const ENV_BUCKET_NAME : &'static str = "TTS_DOWNLOAD_BUCKET_NAME"; -const ENV_BUCKET_ROOT : &'static str = "TTS_DOWNLOAD_BUCKET_ROOT"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; +const ENV_BUCKET_NAME : &str = "TTS_DOWNLOAD_BUCKET_NAME"; +const ENV_BUCKET_ROOT : &str = "TTS_DOWNLOAD_BUCKET_ROOT"; -const DEFAULT_TEMP_DIR: &'static str = "/tmp"; +const DEFAULT_TEMP_DIR: &str = "/tmp"; #[tokio::main] async fn main() -> AnyhowResult<()> { diff --git a/crates/service/job/inference_job/src/http_server/run_http_server.rs b/crates/service/job/inference_job/src/http_server/run_http_server.rs index 3a3e79e2e..3f673665a 100644 --- a/crates/service/job/inference_job/src/http_server/run_http_server.rs +++ b/crates/service/job/inference_job/src/http_server/run_http_server.rs @@ -10,7 +10,7 @@ use std::sync::Arc; use bootstrap::bootstrap::ContainerEnvironment; use jobs_common::job_stats::JobStats; -const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:12345"; +const DEFAULT_BIND_ADDRESS : &str = "0.0.0.0:12345"; const DEFAULT_NUM_WORKERS : usize = 4; pub struct CreateServerArgs { diff --git a/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs index 7f7762d4b..f836b2962 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs @@ -29,7 +29,7 @@ use tts_common::text_pipelines::text_pipeline_type::TextPipelineType; /// Text starting with this will be treated as a test request. /// This allows the request to bypass the model cache and query the latest TTS model. -const TEST_REQUEST_TEXT: &'static str = "This is a test request."; +const TEST_REQUEST_TEXT: &str = "This is a test request."; pub struct ProcessJobArgs<'a> { diff --git a/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs index 88aae5803..602f16054 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs @@ -31,7 +31,7 @@ use crate::job::job_loop::job_success_result::{JobSuccessResult, ResultEntity}; /// Text starting with this will be treated as a test request. /// This allows the request to bypass the model cache and query the latest TTS model. -const TEST_REQUEST_TEXT: &'static str = "This is a test request."; +const TEST_REQUEST_TEXT: &str = "This is a test request."; pub struct VitsProcessJobArgs<'a> { diff --git a/crates/service/job/inference_job/src/main.rs b/crates/service/job/inference_job/src/main.rs index 4f810c764..3b197590b 100644 --- a/crates/service/job/inference_job/src/main.rs +++ b/crates/service/job/inference_job/src/main.rs @@ -62,16 +62,16 @@ use std::time::Duration; use subprocess_common::docker_options::{DockerEnvVar, DockerFilesystemMount, DockerGpu, DockerOptions}; // Buckets (shared config) -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; // Bucket names -const ENV_PRIVATE_BUCKET_NAME : &'static str = "PRIVATE_BUCKET_NAME"; -const ENV_PUBLIC_BUCKET_NAME : &'static str = "PUBLIC_BUCKET_NAME"; +const ENV_PRIVATE_BUCKET_NAME : &str = "PRIVATE_BUCKET_NAME"; +const ENV_PUBLIC_BUCKET_NAME : &str = "PUBLIC_BUCKET_NAME"; // HTTP sidecar -const ENV_TTS_INFERENCE_SIDECAR_HOSTNAME: &'static str = "TTS_INFERENCE_SIDECAR_HOSTNAME"; +const ENV_TTS_INFERENCE_SIDECAR_HOSTNAME: &str = "TTS_INFERENCE_SIDECAR_HOSTNAME"; //#[tokio::main] #[actix_web::main] diff --git a/crates/service/job/tts_download_job/src/main.rs b/crates/service/job/tts_download_job/src/main.rs index 4e07ecae3..bbc9575d6 100644 --- a/crates/service/job/tts_download_job/src/main.rs +++ b/crates/service/job/tts_download_job/src/main.rs @@ -56,13 +56,13 @@ use std::time::Duration; use tempdir::TempDir; // Buckets -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; -const ENV_BUCKET_NAME : &'static str = "TTS_DOWNLOAD_BUCKET_NAME"; -const ENV_BUCKET_ROOT : &'static str = "TTS_DOWNLOAD_BUCKET_ROOT"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; +const ENV_BUCKET_NAME : &str = "TTS_DOWNLOAD_BUCKET_NAME"; +const ENV_BUCKET_ROOT : &str = "TTS_DOWNLOAD_BUCKET_ROOT"; -const DEFAULT_TEMP_DIR: &'static str = "/tmp"; +const DEFAULT_TEMP_DIR: &str = "/tmp"; struct Downloader { pub download_temp_directory: PathBuf, diff --git a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs index 75096d208..619e01751 100644 --- a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs +++ b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs @@ -33,7 +33,7 @@ use tts_common::text_pipelines::text_pipeline_type::TextPipelineType; /// Text starting with this will be treated as a test request. /// This allows the request to bypass the model cache and query the latest TTS model. -const TEST_REQUEST_TEXT: &'static str = "This is a test request."; +const TEST_REQUEST_TEXT: &str = "This is a test request."; #[derive(Deserialize, Default)] struct FileMetadata { diff --git a/crates/service/job/tts_inference_job/src/main.rs b/crates/service/job/tts_inference_job/src/main.rs index 1701d4a0f..62fd8edd9 100644 --- a/crates/service/job/tts_inference_job/src/main.rs +++ b/crates/service/job/tts_inference_job/src/main.rs @@ -66,25 +66,25 @@ use std::path::PathBuf; use std::time::Duration; // Buckets (shared config) -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; // Bucket names -const ENV_PRIVATE_BUCKET_NAME : &'static str = "PRIVATE_BUCKET_NAME"; -const ENV_PUBLIC_BUCKET_NAME : &'static str = "PUBLIC_BUCKET_NAME"; +const ENV_PRIVATE_BUCKET_NAME : &str = "PRIVATE_BUCKET_NAME"; +const ENV_PUBLIC_BUCKET_NAME : &str = "PUBLIC_BUCKET_NAME"; // Where models and other assets get downloaded to. -const ENV_SEMIPERSISTENT_CACHE_DIR : &'static str = "SEMIPERSISTENT_CACHE_DIR"; +const ENV_SEMIPERSISTENT_CACHE_DIR : &str = "SEMIPERSISTENT_CACHE_DIR"; // Python code -const ENV_CODE_DIRECTORY : &'static str = "TTS_CODE_DIRECTORY"; -const ENV_INFERENCE_SCRIPT_NAME : &'static str = "TTS_INFERENCE_SCRIPT_NAME"; +const ENV_CODE_DIRECTORY : &str = "TTS_CODE_DIRECTORY"; +const ENV_INFERENCE_SCRIPT_NAME : &str = "TTS_INFERENCE_SCRIPT_NAME"; // HTTP sidecar -const ENV_TTS_INFERENCE_SIDECAR_HOSTNAME: &'static str = "TTS_INFERENCE_SIDECAR_HOSTNAME"; +const ENV_TTS_INFERENCE_SIDECAR_HOSTNAME: &str = "TTS_INFERENCE_SIDECAR_HOSTNAME"; -const DEFAULT_TEMP_DIR: &'static str = "/tmp"; +const DEFAULT_TEMP_DIR: &str = "/tmp"; #[tokio::main] async fn main() -> AnyhowResult<()> { diff --git a/crates/service/job/w2l_download_job/src/main.rs b/crates/service/job/w2l_download_job/src/main.rs index c63f1537f..06dafc878 100644 --- a/crates/service/job/w2l_download_job/src/main.rs +++ b/crates/service/job/w2l_download_job/src/main.rs @@ -58,24 +58,24 @@ use std::time::Duration; use tempdir::TempDir; // Buckets (shared config) -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; // Buckets (private data) -const ENV_PRIVATE_BUCKET_NAME : &'static str = "W2L_PRIVATE_DOWNLOAD_BUCKET_NAME"; +const ENV_PRIVATE_BUCKET_NAME : &str = "W2L_PRIVATE_DOWNLOAD_BUCKET_NAME"; // Buckets (public data) -const ENV_PUBLIC_BUCKET_NAME : &'static str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; +const ENV_PUBLIC_BUCKET_NAME : &str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; // Various bucket roots -const ENV_DOWNLOAD_BUCKET_ROOT : &'static str = "W2L_DOWNLOAD_BUCKET_ROOT"; +const ENV_DOWNLOAD_BUCKET_ROOT : &str = "W2L_DOWNLOAD_BUCKET_ROOT"; // Python code -const ENV_CODE_DIRECTORY : &'static str = "W2L_CODE_DIRECTORY"; -const ENV_MODEL_CHECKPOINT : &'static str = "W2L_MODEL_CHECKPOINT"; -const ENV_DOWNLOAD_SCRIPT_NAME : &'static str = "W2L_DOWNLOAD_SCRIPT_NAME"; +const ENV_CODE_DIRECTORY : &str = "W2L_CODE_DIRECTORY"; +const ENV_MODEL_CHECKPOINT : &str = "W2L_MODEL_CHECKPOINT"; +const ENV_DOWNLOAD_SCRIPT_NAME : &str = "W2L_DOWNLOAD_SCRIPT_NAME"; -const DEFAULT_TEMP_DIR: &'static str = "/tmp"; +const DEFAULT_TEMP_DIR: &str = "/tmp"; struct Downloader { pub download_temp_directory: PathBuf, diff --git a/crates/service/job/w2l_inference_job/src/main.rs b/crates/service/job/w2l_inference_job/src/main.rs index 67bfc09b6..9b4b5a27f 100644 --- a/crates/service/job/w2l_inference_job/src/main.rs +++ b/crates/service/job/w2l_inference_job/src/main.rs @@ -55,24 +55,24 @@ use std::time::Duration; use tempdir::TempDir; // Buckets (shared config) -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; // Buckets (private data) -const ENV_PRIVATE_BUCKET_NAME : &'static str = "W2L_PRIVATE_DOWNLOAD_BUCKET_NAME"; +const ENV_PRIVATE_BUCKET_NAME : &str = "W2L_PRIVATE_DOWNLOAD_BUCKET_NAME"; // Buckets (public data) -const ENV_PUBLIC_BUCKET_NAME : &'static str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; +const ENV_PUBLIC_BUCKET_NAME : &str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; // Where models and other assets get downloaded to. -const ENV_SEMIPERSISTENT_CACHE_DIR : &'static str = "SEMIPERSISTENT_CACHE_DIR"; +const ENV_SEMIPERSISTENT_CACHE_DIR : &str = "SEMIPERSISTENT_CACHE_DIR"; // Python code -const ENV_CODE_DIRECTORY : &'static str = "W2L_CODE_DIRECTORY"; -const ENV_MODEL_CHECKPOINT : &'static str = "W2L_MODEL_CHECKPOINT"; -const ENV_INFERENCE_SCRIPT_NAME : &'static str = "W2L_INFERENCE_SCRIPT_NAME"; +const ENV_CODE_DIRECTORY : &str = "W2L_CODE_DIRECTORY"; +const ENV_MODEL_CHECKPOINT : &str = "W2L_MODEL_CHECKPOINT"; +const ENV_INFERENCE_SCRIPT_NAME : &str = "W2L_INFERENCE_SCRIPT_NAME"; -const DEFAULT_TEMP_DIR: &'static str = "/tmp"; +const DEFAULT_TEMP_DIR: &str = "/tmp"; struct Inferencer { pub download_temp_directory: PathBuf, diff --git a/crates/service/other/twitch_pubsub_subscriber/src/twitch/websocket_client.rs b/crates/service/other/twitch_pubsub_subscriber/src/twitch/websocket_client.rs index f579e5f08..6cc23cdca 100644 --- a/crates/service/other/twitch_pubsub_subscriber/src/twitch/websocket_client.rs +++ b/crates/service/other/twitch_pubsub_subscriber/src/twitch/websocket_client.rs @@ -18,9 +18,9 @@ use twitch_api2::pubsub; // Reference javascript Twitch Websocket client: // https://github.com/twitchdev/pubsub-javascript-sample/blob/main/main.js -const WEBSOCKET_GATEWAY : &'static str = "wss://pubsub-edge.twitch.tv"; +const WEBSOCKET_GATEWAY : &str = "wss://pubsub-edge.twitch.tv"; -const PING_COMMAND : &'static str = "{ \"type\": \"PING\" }"; +const PING_COMMAND : &str = "{ \"type\": \"PING\" }"; pub struct TwitchWebsocketClient { socket: Option>>, diff --git a/crates/service/plugins/billing/src/stripe/helpers/common_metadata_keys.rs b/crates/service/plugins/billing/src/stripe/helpers/common_metadata_keys.rs index fc2d86317..ee51efb12 100644 --- a/crates/service/plugins/billing/src/stripe/helpers/common_metadata_keys.rs +++ b/crates/service/plugins/billing/src/stripe/helpers/common_metadata_keys.rs @@ -1,5 +1,5 @@ //! Keys that are used as metadata frequently. -pub const METADATA_USER_TOKEN : &'static str = "user_token"; -pub const METADATA_USERNAME : &'static str = "username"; -pub const METADATA_EMAIL : &'static str = "email"; +pub const METADATA_USER_TOKEN : &str = "user_token"; +pub const METADATA_USERNAME : &str = "username"; +pub const METADATA_EMAIL : &str = "email"; diff --git a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs index 177c31924..965be186b 100644 --- a/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs +++ b/crates/service/plugins/billing/src/stripe/http_endpoints/webhook/webhook_event_handlers/customer_subscription/common.rs @@ -1,8 +1,8 @@ /// Subscription categories are used to namespace subscriptions. /// Integrations should always provide a default even if this isn't used. -pub const UNKNOWN_SUBSCRIPTION_NAMESPACE: &'static str = "unknown"; +pub const UNKNOWN_SUBSCRIPTION_NAMESPACE: &str = "unknown"; /// The integrated system has internal unique string key identifiers for /// each subscription plan. -pub const UNKNOWN_SUBSCRIPTION_PRODUCT_SLUG: &'static str = "unknown"; +pub const UNKNOWN_SUBSCRIPTION_PRODUCT_SLUG: &str = "unknown"; diff --git a/crates/service/plugins/users/src/lib.rs b/crates/service/plugins/users/src/lib.rs index 51a053379..9570a7af3 100644 --- a/crates/service/plugins/users/src/lib.rs +++ b/crates/service/plugins/users/src/lib.rs @@ -1,8 +1,8 @@ #[macro_use] extern crate lazy_static; #[macro_use] extern crate serde_derive; -pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../../includes/binary_includes/reserved_usernames.txt"); -pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../../includes/binary_includes/reserved_usernames_including.txt"); +pub const RESERVED_USERNAMES : &str = include_str!("../../../../../includes/binary_includes/reserved_usernames.txt"); +pub const RESERVED_SUBSTRINGS : &str = include_str!("../../../../../includes/binary_includes/reserved_usernames_including.txt"); pub mod default_routes; pub mod endpoints; diff --git a/crates/service/plugins/users/src/utils/session_cookie_manager.rs b/crates/service/plugins/users/src/utils/session_cookie_manager.rs index 9d3e8cc10..e6e4cdc53 100644 --- a/crates/service/plugins/users/src/utils/session_cookie_manager.rs +++ b/crates/service/plugins/users/src/utils/session_cookie_manager.rs @@ -23,7 +23,7 @@ use std::collections::BTreeMap; */ const COOKIE_VERSION : u32 = 2; -const SESSION_COOKIE_NAME : &'static str = "session"; +const SESSION_COOKIE_NAME : &str = "session"; // TODO(echelon,2022-08-29): Make a CryptedCookieManager that this uses. // TODO(echelon,2022-08-29): Fix how domains and "secure" cookies are handled diff --git a/crates/service/web/dummy_service/src/main.rs b/crates/service/web/dummy_service/src/main.rs index cbfd6fd2e..1b8cd44bb 100644 --- a/crates/service/web/dummy_service/src/main.rs +++ b/crates/service/web/dummy_service/src/main.rs @@ -14,7 +14,7 @@ use crate::env_args::env_args; use errors::AnyhowResult; use http_server_common::cors::build_cors_config; -pub const DEFAULT_RUST_LOG: &'static str = concat!( +pub const DEFAULT_RUST_LOG: &str = concat!( "debug,", "actix_web=info,", "hyper::proto::h1::io=warn,", diff --git a/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs b/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs index 85ee9bdac..651185e61 100644 --- a/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs +++ b/crates/service/web/storyteller_web/src/billing/stripe_internal_subscription_product_lookup_impl.rs @@ -1,7 +1,7 @@ use billing_component::stripe::traits::internal_subscription_product_lookup::{InternalProductLookupError, InternalSubscriptionProduct, InternalSubscriptionProductLookup}; use crate::configs::plans::plan_list::{PLANS_BY_STRIPE_PRICE_ID, PLANS_BY_STRIPE_PRODUCT_ID}; -const SUBSCRIPTION_CATEGORY : &'static str = "fakeyou"; +const SUBSCRIPTION_CATEGORY : &str = "fakeyou"; /// A simple Actix injectable action #[derive(Clone, Copy)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/sort_models.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/sort_models.rs index b6d083501..8968dcca0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/sort_models.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/categories/tts/list_fully_computed_assigned_tts_categories/sort_models.rs @@ -4,7 +4,7 @@ use tokens::tokens::model_categories::ModelCategoryToken; use tokens::tokens::tts_models::TtsModelToken; use crate::http_server::endpoints::categories::tts::list_fully_computed_assigned_tts_categories::query_and_construct_payload::{CategoryTokenToModelTokensMap, TtsModelInfoLite}; -const UNNAMED_MODEL_SORT_VALUE : &'static str = "unnamed"; +const UNNAMED_MODEL_SORT_VALUE : &str = "unnamed"; struct SortableModelToken { model_token: TtsModelToken, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/build_design_refresh_cookie.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/build_design_refresh_cookie.rs index 379766c51..bf074bfdb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/build_design_refresh_cookie.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/flags/design_refresh_flag/build_design_refresh_cookie.rs @@ -1,7 +1,7 @@ use actix_web::cookie::{Cookie, CookieBuilder}; use crate::server_state::ServerState; -const REFRESH_COOKIE_NAME : &'static str = "refresh"; +const REFRESH_COOKIE_NAME : &str = "refresh"; pub fn build_design_refresh_cookie(server_state: &ServerState, enable: bool) -> CookieBuilder { let value = if enable { "true" } else { "false " }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/default_redirect.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/default_redirect.rs index 95ac8fbc4..354998915 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/default_redirect.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/default_redirect.rs @@ -1,5 +1,5 @@ -pub const DEFAULT_INVESTOR_REDIRECT : &'static str = "https://fakeyou.com"; +pub const DEFAULT_INVESTOR_REDIRECT : &str = "https://fakeyou.com"; pub fn redirect_is_allowed(redirect_url: &str) -> bool { match redirect_url { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/demo_cookie.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/demo_cookie.rs index 540ffe58a..286f77ec9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/demo_cookie.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/investor_demo/demo_cookie.rs @@ -2,7 +2,7 @@ use actix_web::HttpRequest; -pub const STORYTELLER_DEMO_COOKIE_NAME : &'static str = "storyteller_demo"; +pub const STORYTELLER_DEMO_COOKIE_NAME : &str = "storyteller_demo"; pub fn request_has_demo_cookie(http_request: &HttpRequest) -> bool { // NB: Payload of the cookie does not matter. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs index da5bdb88b..9ebb4a171 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs @@ -1,7 +1,7 @@ use actix_web::cookie::Cookie; use crate::server_state::ServerState; -pub const ALPHA_COOKIE_NAME : &'static str = "enable-alpha"; +pub const ALPHA_COOKIE_NAME : &str = "enable-alpha"; pub fn alpha_cookie(server_state: &ServerState) -> Cookie { Cookie::build(ALPHA_COOKIE_NAME, "true") diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs index f23e545be..a7d16296f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs @@ -60,7 +60,7 @@ impl fmt::Display for DetectLocaleError { // =============== Handler =============== -pub const FORCE_LOCALE_COOKIE_HEADER_NAME : &'static str = "force-locale"; +pub const FORCE_LOCALE_COOKIE_HEADER_NAME : &str = "force-locale"; pub async fn detect_locale_handler( http_request: HttpRequest, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs index b92ee7bbd..ae7a4bff4 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs @@ -7,11 +7,11 @@ use crate::server_state::ServerState; use log::info; use std::sync::Arc; -const CONTENT_TYPE : &'static str = "text/html; charset=utf-8"; +const CONTENT_TYPE : &str = "text/html; charset=utf-8"; -const ENABLE_LINK : &'static str = "I want Vocodes 2.0"; -const DISABLE_LINK : &'static str = "I don't want Vocodes 2.0"; -const STATUS_LINK : &'static str = "status"; +const ENABLE_LINK : &str = "I want Vocodes 2.0"; +const DISABLE_LINK : &str = "I don't want Vocodes 2.0"; +const STATUS_LINK : &str = "status"; #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs index 0d761401f..23baf30b2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs @@ -27,8 +27,8 @@ use tts_common::text_pipelines::text_pipeline_type::TextPipelineType; use user_input_common::check_for_slurs::contains_slurs; use user_input_common::markdown_to_html::markdown_to_html; -const DEFAULT_IETF_LANGUAGE_TAG : &'static str = "en-US"; -const DEFAULT_IETF_PRIMARY_LANGUAGE_SUBTAG : &'static str = "en"; +const DEFAULT_IETF_LANGUAGE_TAG : &str = "en-US"; +const DEFAULT_IETF_PRIMARY_LANGUAGE_SUBTAG : &str = "en"; /// For the URL PathInfo #[derive(Deserialize)] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs index add305957..6fa62842a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts_handler/enqueue_infer_tts_handler.rs @@ -37,7 +37,7 @@ use user_input_common::check_for_slurs::contains_slurs; use users_component::utils::user_session_extended::UserSessionExtended; // TODO: Temporary for investor demo -const STORYTELLER_DEMO_COOKIE_NAME : &'static str = "storyteller_demo"; +const STORYTELLER_DEMO_COOKIE_NAME : &str = "storyteller_demo"; /// Debug requests mean different things, depending on the type of worker (the legacy /// tts-inference-job vs. the new inference-job): @@ -49,19 +49,19 @@ const STORYTELLER_DEMO_COOKIE_NAME : &'static str = "storyteller_demo"; /// anything in the code. (There's a new system for routing requests called /// "routing tags" that is independent of this flag.) /// -const DEBUG_HEADER_NAME : &'static str = "enable-debug-mode"; +const DEBUG_HEADER_NAME : &str = "enable-debug-mode"; /// Requests with this header can be forced onto the new jobs system. /// It'll be used to help test TT2 on the new system before it is rolled out for everyone. -const NEW_JOB_SYSTEM_HEADER_NAME : &'static str = "new-job-system"; +const NEW_JOB_SYSTEM_HEADER_NAME : &str = "new-job-system"; /// The routing tag header can send workloads to particular k8s hosts. /// This is useful for catching the live logs or intercepting the job. /// NB: This is only for the new job system. -const ROUTING_TAG_HEADER_NAME : &'static str = "routing-tag"; +const ROUTING_TAG_HEADER_NAME : &str = "routing-tag"; -const USER_FAKEYOU_USER_TOKEN : &'static str = "U:N5J8JXPW9BTYX"; -const USER_NEWS_STORY_USER_TOKEN : &'static str = "U:XAWRARC1N89X6"; +const USER_FAKEYOU_USER_TOKEN : &str = "U:N5J8JXPW9BTYX"; +const USER_NEWS_STORY_USER_TOKEN : &str = "U:XAWRARC1N89X6"; /// Safety guard against plans supporting too lengthy TTS inference text. const MAX_TTS_LENGTH : usize = 10_000; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs index c44f72793..d94707679 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/voice_conversion/inference/enqueue_voice_conversion_inference.rs @@ -36,11 +36,11 @@ use tts_common::priority::FAKEYOU_INVESTOR_PRIORITY_LEVEL; /// Debug requests can get routed to special "debug-only" workers, which can /// be used to trial new code, run debugging, etc. -const DEBUG_HEADER_NAME : &'static str = "enable-debug-mode"; +const DEBUG_HEADER_NAME : &str = "enable-debug-mode"; /// The routing tag header can send workloads to particular k8s hosts. /// This is useful for catching the live logs or intercepting the job. -const ROUTING_TAG_HEADER_NAME : &'static str = "routing-tag"; +const ROUTING_TAG_HEADER_NAME : &str = "routing-tag"; #[derive(Deserialize)] pub struct EnqueueVoiceConversionInferenceRequest { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index 248e80949..eeff5a2c3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -24,9 +24,9 @@ use std::sync::Arc; use mysql_queries::queries::w2l::w2l_inference_jobs::insert_w2l_inference_job_extended::{insert_w2l_inference_job_extended, InsertW2lInferenceJobExtendedArgs}; use mysql_queries::queries::w2l::w2l_templates::check_w2l_template_exists::check_w2l_template_exists; -const BUCKET_AUDIO_FILE_NAME : &'static str = "input_audio_file"; -const BUCKET_IMAGE_FILE_NAME: &'static str = "input_image_file"; -const BUCKET_VIDEO_FILE_NAME : &'static str = "input_video_file"; +const BUCKET_AUDIO_FILE_NAME : &str = "input_audio_file"; +const BUCKET_IMAGE_FILE_NAME: &str = "input_image_file"; +const BUCKET_VIDEO_FILE_NAME : &str = "input_video_file"; const MIN_BYTES : usize = 10; const MAX_BYTES : usize = 1024 * 1024 * 20; diff --git a/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs b/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs index a89c8ef25..49838c2e8 100644 --- a/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs +++ b/crates/service/web/storyteller_web/src/http_server/web_utils/redis_rate_limiter.rs @@ -9,7 +9,7 @@ use limitation::{Limiter, Error}; use log::info; /// If this HTTP header is set, the rate limiter can be bypassed (eg. for debugging) -const RATE_LIMIT_BYPASS_HEADER : &'static str = "limitless"; +const RATE_LIMIT_BYPASS_HEADER : &str = "limitless"; #[derive(Clone)] // NB: Limiter is `Clone` pub struct RedisRateLimiter { diff --git a/crates/service/web/storyteller_web/src/main.rs b/crates/service/web/storyteller_web/src/main.rs index f8b07baa1..3cca4651a 100644 --- a/crates/service/web/storyteller_web/src/main.rs +++ b/crates/service/web/storyteller_web/src/main.rs @@ -17,8 +17,8 @@ #[macro_use] extern crate magic_crypt; #[macro_use] extern crate serde_derive; -pub const RESERVED_USERNAMES : &'static str = include_str!("../../../../../includes/binary_includes/reserved_usernames.txt"); -pub const RESERVED_SUBSTRINGS : &'static str = include_str!("../../../../../includes/binary_includes/reserved_usernames_including.txt"); +pub const RESERVED_USERNAMES : &str = include_str!("../../../../../includes/binary_includes/reserved_usernames.txt"); +pub const RESERVED_SUBSTRINGS : &str = include_str!("../../../../../includes/binary_includes/reserved_usernames_including.txt"); pub mod billing; pub mod configs; @@ -98,20 +98,20 @@ use users_component::utils::session_cookie_manager::SessionCookieManager; use crate::memory_cache::model_token_to_info_cache::ModelTokenToInfoCache; use crate::threads::poll_model_token_info_thread::poll_model_token_info_thread; -const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:12345"; +const DEFAULT_BIND_ADDRESS : &str = "0.0.0.0:12345"; // Buckets (shared config) -const ENV_ACCESS_KEY : &'static str = "ACCESS_KEY"; -const ENV_SECRET_KEY : &'static str = "SECRET_KEY"; -const ENV_REGION_NAME : &'static str = "REGION_NAME"; +const ENV_ACCESS_KEY : &str = "ACCESS_KEY"; +const ENV_SECRET_KEY : &str = "SECRET_KEY"; +const ENV_REGION_NAME : &str = "REGION_NAME"; // Buckets (private data) -const ENV_PRIVATE_BUCKET_NAME : &'static str = "W2L_PRIVATE_DOWNLOAD_BUCKET_NAME"; +const ENV_PRIVATE_BUCKET_NAME : &str = "W2L_PRIVATE_DOWNLOAD_BUCKET_NAME"; // Buckets (public data) -const ENV_PUBLIC_BUCKET_NAME : &'static str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; +const ENV_PUBLIC_BUCKET_NAME : &str = "W2L_PUBLIC_DOWNLOAD_BUCKET_NAME"; // Various bucket roots -const ENV_AUDIO_UPLOADS_BUCKET_ROOT : &'static str = "AUDIO_UPLOADS_BUCKET_ROOT"; +const ENV_AUDIO_UPLOADS_BUCKET_ROOT : &str = "AUDIO_UPLOADS_BUCKET_ROOT"; #[actix_web::main] async fn main() -> AnyhowResult<()> { diff --git a/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs b/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs index 9a4765d0b..c341d3eb2 100644 --- a/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs +++ b/crates/service/web/storyteller_web/src/threads/poll_ip_banlist_thread.rs @@ -9,7 +9,7 @@ use std::collections::HashSet; use std::thread; use std::time::Duration; -const DYNAMIC_BAN_LIST_NAME : &'static str = "DYNAMIC_POLLING_IP_BAN_LIST"; +const DYNAMIC_BAN_LIST_NAME : &str = "DYNAMIC_POLLING_IP_BAN_LIST"; pub async fn poll_ip_bans( ip_ban_list: IpBanList, diff --git a/crates/service/web/websocket_gateway/src/main.rs b/crates/service/web/websocket_gateway/src/main.rs index 71499311f..4fb36fc9c 100644 --- a/crates/service/web/websocket_gateway/src/main.rs +++ b/crates/service/web/websocket_gateway/src/main.rs @@ -47,7 +47,7 @@ use twitch_common::twitch_secrets::TwitchSecrets; use twitch_oauth2::tokens::UserTokenBuilder; use twitch_oauth2::{AppAccessToken, Scope, TwitchToken, tokens::errors::AppAccessTokenError, ClientId, ClientSecret}; -const DEFAULT_BIND_ADDRESS : &'static str = "0.0.0.0:54321"; +const DEFAULT_BIND_ADDRESS : &str = "0.0.0.0:54321"; #[actix_web::main] //#[tokio::main] diff --git a/crates/vendor/newrelic-telemetry-sdk-rust/src/client.rs b/crates/vendor/newrelic-telemetry-sdk-rust/src/client.rs index 3660ca97e..c78230644 100644 --- a/crates/vendor/newrelic-telemetry-sdk-rust/src/client.rs +++ b/crates/vendor/newrelic-telemetry-sdk-rust/src/client.rs @@ -17,8 +17,8 @@ use std::pin::Pin; use std::thread; use std::time::Duration; -const VERSION: &'static str = env!("CARGO_PKG_VERSION"); -const TRACE_API_PATH: &'static str = "trace/v1"; +const VERSION: &str = env!("CARGO_PKG_VERSION"); +const TRACE_API_PATH: &str = "trace/v1"; /// Types that can be sent to a New Relic ingest API ///