From f812fbb4e6a1f91e1676b58f7f1ca494f0710664 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 20 Jan 2024 18:40:15 -0500 Subject: [PATCH] rust lint: unused mut --- Cranky.toml | 3 +-- .../src/seeding/model_weights.rs | 20 +++++++++---------- crates/cli/dev-upload-media-file/src/main.rs | 8 ++++---- crates/lib/jobs_common/src/job_stats.rs | 2 +- .../upsert_model_weight_from_tts_model.rs | 2 +- ...odel_weight_from_voice_conversion_model.rs | 2 +- .../src/sites/gizmodo/gizmodo_indexer.rs | 2 +- .../src/sites/kotaku/kotaku_indexer.rs | 2 +- .../image_generation/sd/process_job.rs | 3 +-- .../lipsync/sad_talker/validate_job.rs | 4 ++-- .../rerender_a_video/process_job.rs | 2 +- .../ffmpeg_logo_watermark_command.rs | 2 +- crates/service/web/dummy_service/src/main.rs | 4 ++-- 13 files changed, 27 insertions(+), 29 deletions(-) diff --git a/Cranky.toml b/Cranky.toml index 0dc4429235..4c304e692a 100644 --- a/Cranky.toml +++ b/Cranky.toml @@ -43,8 +43,7 @@ deny = [ "unused_imports", # These are easy to automatically cull "unused_parens", # Unused parens are ugly "unused_variables", # Don't leave cruft - - #"unused_mut", # Be strict about mutability (TODO) + "unused_mut", # Be strict about mutability # Possible: # "clippy::ptr_arg", diff --git a/crates/cli/dev-database-seed/src/seeding/model_weights.rs b/crates/cli/dev-database-seed/src/seeding/model_weights.rs index 171d3a5942..3d1448f51a 100644 --- a/crates/cli/dev-database-seed/src/seeding/model_weights.rs +++ b/crates/cli/dev-database-seed/src/seeding/model_weights.rs @@ -146,22 +146,22 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool, user_token: UserT _ => WeightsType::LoRA }; - let mut model_weight_token; - let mut title; - let mut description; - let mut description_rendered_html; - let mut original_filename; - let mut original_download_url; + let model_weight_token; + let title; + let description; + let description_rendered_html; + let original_filename; + let original_download_url; - let mut _private_bucket_hash:String = "".to_string(); - let mut private_bucket_prefix; - let mut private_bucket_extension; + let _private_bucket_hash = "".to_string(); + let private_bucket_prefix; + let private_bucket_extension; //let mut cached_user_ratings_total_count; //let mut cached_user_ratings_positive_count; //let mut cached_user_ratings_negative_count; //let mut cached_user_ratings_ratio; - let mut version; + let version; match i { 1..=20 => { diff --git a/crates/cli/dev-upload-media-file/src/main.rs b/crates/cli/dev-upload-media-file/src/main.rs index 87bcd5665e..817ca27f33 100644 --- a/crates/cli/dev-upload-media-file/src/main.rs +++ b/crates/cli/dev-upload-media-file/src/main.rs @@ -64,10 +64,10 @@ pub async fn main() -> AnyhowResult<()> { let bytes = file_read_bytes(args.file_path)?; let mimetype = get_mimetype_for_bytes(&bytes); - let mut media_file_type; - let mut maybe_mime_type; - let mut maybe_public_bucket_prefix; - let mut maybe_public_bucket_extension; + let media_file_type; + let maybe_mime_type; + let maybe_public_bucket_prefix; + let maybe_public_bucket_extension; match mimetype { Some("audio/wav") | diff --git a/crates/lib/jobs_common/src/job_stats.rs b/crates/lib/jobs_common/src/job_stats.rs index 80554a133f..681a42b359 100644 --- a/crates/lib/jobs_common/src/job_stats.rs +++ b/crates/lib/jobs_common/src/job_stats.rs @@ -37,7 +37,7 @@ impl JobStats { pub fn get_status(&self) -> AnyhowResult { // NB: lock errors can't be moved between threads, so we change their type - let mut lock = self.inner.read() + let lock = self.inner.read() .map_err(|e| anyhow!("lock read error: {:?}", e))?; Ok(SuccessAndFailureStats { diff --git a/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs b/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs index ec9f0fd24e..9ac3dc3715 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_tts_model.rs @@ -48,7 +48,7 @@ pub async fn upsert_model_weights_record( record: &WholeTtsModelRecord, model_weight_token: &ModelWeightToken, copied_data: &CopiedTtsFileData, - mut transaction: &mut Transaction<'_, MySql>, + transaction: &mut Transaction<'_, MySql>, ) -> AnyhowResult<()> { // NB: We never supported other TTS models in the tts_models table. diff --git a/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs b/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs index c10ccb69f7..5c769b7311 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs @@ -50,7 +50,7 @@ pub async fn upsert_model_weights_record( record: &WholeVoiceConversionModelRecord, model_weight_token: &ModelWeightToken, copied_data: &CopiedFileData, - mut transaction: &mut Transaction<'_, MySql>, + transaction: &mut Transaction<'_, MySql>, ) -> AnyhowResult<()> { let weights_type = match record.model_type { 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 23c80056fb..638b8a0251 100644 --- a/crates/lib/web_scrapers/src/sites/gizmodo/gizmodo_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/gizmodo/gizmodo_indexer.rs @@ -28,7 +28,7 @@ pub async fn gizmodo_indexer() -> AnyhowResult> { } }; - let mut maybe_skip_reason = None; + let maybe_skip_reason = None; //// Lazy heuristic to skip CNN video articles, which contain little text. //// eg. https://www.cnn.com/videos/politics/2023/02/08/pelosi-gop-hecklers-reaction-joe-biden-state-of-the-union-tapper-intv-vpx.cnn 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 521c9efdfe..f7f1f6bc31 100644 --- a/crates/lib/web_scrapers/src/sites/kotaku/kotaku_indexer.rs +++ b/crates/lib/web_scrapers/src/sites/kotaku/kotaku_indexer.rs @@ -28,7 +28,7 @@ pub async fn kotaku_indexer() -> AnyhowResult> { } }; - let mut maybe_skip_reason = None; + let maybe_skip_reason = None; //// Lazy heuristic to skip CNN video articles, which contain little text. //// eg. https://www.cnn.com/videos/politics/2023/02/08/pelosi-gop-hecklers-reaction-joe-biden-state-of-the-union-tapper-intv-vpx.cnn diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs index d020ea1faf..e632ab4026 100644 --- a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/process_job.rs @@ -141,11 +141,10 @@ pub async fn process_job_inference( // thread::sleep(seconds) to check the directory //NB: TempDir exists until it goes out of scope, at which point it should delete from filesystem. - let mut work_temp_dir = args.job_dependencies.fs.scoped_temp_dir_creator_for_work + let work_temp_dir = args.job_dependencies.fs.scoped_temp_dir_creator_for_work .new_tempdir(&work_temp_dir) .map_err(|e| ProcessSingleJobError::from_io_error(e))?; - let sd_checkpoint_path = work_temp_dir.path().join("sd_checkpoint.safetensors"); let lora_path = work_temp_dir.path().join("lora.safetensors"); let vae_path = work_temp_dir.path().join("vae.safetensors"); diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs index 7f3c7954a0..fdd04d2b22 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/validate_job.rs @@ -86,8 +86,8 @@ pub fn validate_job(job: &AvailableInferenceJob) -> Result Some("RestoreFormer".to_string()), }; - let mut width = inference_args.maybe_resize_width; - let mut height = inference_args.maybe_resize_height; + let width = inference_args.maybe_resize_width; + let height = inference_args.maybe_resize_height; Ok(JobArgs { audio_source, diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs index f6e556dddf..2b04dfc2e5 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/process_job.rs @@ -87,7 +87,7 @@ pub async fn process_job(args: RerenderProcessJobArgs<'_>) -> Result AnyhowResult<()> { // I'm too tired to figure out the generic types though. if env_args.enable_gzip { HttpServer::new(move || { - let mut app = App::new() + let app = App::new() .wrap(Logger::new(&log_format)) .wrap(DefaultHeaders::new() .header("X-Backend-Hostname", &server_hostname)) @@ -55,7 +55,7 @@ async fn main() -> AnyhowResult<()> { .await?; } else { HttpServer::new(move || { - let mut app = App::new() + let app = App::new() .wrap(Logger::new(&log_format)) .wrap(DefaultHeaders::new() .header("X-Backend-Hostname", &server_hostname));