Fix new lints

Author: tazz4843

scripty_audio_handler/src/audio_handler.rs

@@ -226,12 +226,9 @@ impl AudioHandler {
 			.store(guild_res.kiai_enabled, Ordering::Relaxed);
 
 		std::mem::swap(&mut *self.language.write(), &mut guild_res.language);
-		std::mem::swap(
-			&mut *self.transcribe_only_role.write(),
-			&mut guild_res
-				.transcript_only_role
-				.map(|x| RoleId::new(x as u64)),
-		);
+		*self.transcribe_only_role.write() = guild_res
+			.transcript_only_role
+			.map(|x| RoleId::new(x as u64));
 
 		Ok(())
 	}

scripty_audio_handler/src/events/driver_disconnect.rs

@@ -104,21 +104,19 @@ pub async fn driver_disconnect(
 			)
 			.await
 			.map_err(|x| x.kind)
-			{
-				if let Err(e) = webhook2
+				&& let Err(e) = webhook2
 					.execute(
 						&ctx3.http,
 						false,
 						ExecuteWebhook::default()
 							.content(format!("Failed to reconnect due to: {}", e)),
 					)
 					.await
-				{
-					debug!(
-						?guild_id,
-						"failed to notify user about reconnect failure: {}", e
-					);
-				}
+			{
+				debug!(
+					?guild_id,
+					"failed to notify user about reconnect failure: {}", e
+				);
 			}
 		});
 	}

scripty_audio_handler/src/events/speaking_state_update.rs

@@ -75,13 +75,12 @@ pub async fn speaking_state_update(
 	if let Some(old_user_id) = ssrc_state
 		.ssrc_user_id_map
 		.insert(state_update.ssrc, user_id)
+		&& old_user_id != user_id
 	{
-		if old_user_id != user_id {
-			warn!(
-				?state_update.speaking, ?state_update.ssrc, ?state_update.user_id,
-				"Old user ID mapped to this SSRC does not match new! old: {}, new: {}",
-				old_user_id, user_id
-			);
-		}
+		warn!(
+			?state_update.speaking, ?state_update.ssrc, ?state_update.user_id,
+			"Old user ID mapped to this SSRC does not match new! old: {}, new: {}",
+			old_user_id, user_id
+		);
 	}
 }

scripty_bot_utils/src/entity_block.rs

@@ -65,36 +65,35 @@ async fn _check_block(ctx: poise::Context<'_, Data, Error>) -> Result<bool, Erro
 	let ctx_id = ctx.id();
 	trace!(%ctx_id, "checking if user is blocked");
 
-	if let Some(guild) = ctx.guild_id() {
-		if let Some(reason) = redis
+	if let Some(guild) = ctx.guild_id()
+		&& let Some(reason) = redis
 			.get::<_, Option<String>>(format!("guild:{{{}}}:blocked", guild))
 			.await?
-		{
-			trace!(%ctx_id, "guild is blocked");
-			let resolved_language = scripty_i18n::get_resolved_language(
-				ctx.author().id.get(),
-				ctx.guild_id().map(|g| g.get()),
-			)
-			.await;
-
-			let reason = if reason.is_empty() {
-				format_message!(resolved_language, "blocked-entity-no-reason-given")
-			} else {
-				format_message!(
-					resolved_language,
-					"blocked-entity-reason-given",
-					reason: reason
-				)
-			};
-			ctx.say(format_message!(
+	{
+		trace!(%ctx_id, "guild is blocked");
+		let resolved_language = scripty_i18n::get_resolved_language(
+			ctx.author().id.get(),
+			ctx.guild_id().map(|g| g.get()),
+		)
+		.await;
+
+		let reason = if reason.is_empty() {
+			format_message!(resolved_language, "blocked-entity-no-reason-given")
+		} else {
+			format_message!(
 				resolved_language,
-				"blocked-entity-guild",
-				reason: reason,
-				supportServerInvite: cfg.support_invite.to_string()
-			))
-			.await?;
-			return Ok(false);
-		}
+				"blocked-entity-reason-given",
+				reason: reason
+			)
+		};
+		ctx.say(format_message!(
+			resolved_language,
+			"blocked-entity-guild",
+			reason: reason,
+			supportServerInvite: cfg.support_invite.to_string()
+		))
+		.await?;
+		return Ok(false);
 	}
 
 	let hashed_user_id = scripty_utils::hash_user_id(ctx.author().id.get());

scripty_bot_utils/src/file_transcripts/raw_pcm_conversions.rs

@@ -128,11 +128,11 @@ async fn convert_path_to_pcm(path: &Path) -> Result<Vec<i16>, FileTranscriptErro
 	// read the output from ffmpeg
 	debug!(?path, "finishing up ffmpeg process");
 	let res = command.wait().await?;
-	if let Some(code) = res.code() {
-		if code != 0 {
-			error!(?path, "ffmpeg exited with code {}", code);
-			return Err(FileTranscriptError::FfmpegExited(code));
-		}
+	if let Some(code) = res.code()
+		&& code != 0
+	{
+		error!(?path, "ffmpeg exited with code {}", code);
+		return Err(FileTranscriptError::FfmpegExited(code));
 	}
 
 	// need to convert the output to i16

scripty_bot_utils/src/lib.rs

@@ -1,5 +1,4 @@
 #![feature(let_chains)]
-#![feature(slice_as_chunks)]
 #[macro_use]
 extern crate tracing;
 #[macro_use]

scripty_commands/src/cmds/config/default_settings/ephemeral.rs

@@ -21,12 +21,11 @@ pub async fn config_default_settings_ephemeral(
 		scripty_i18n::get_resolved_language(ctx.author().id.get(), Some(guild_id.get())).await;
 	let db = scripty_db::get_db();
 
-	if ephemeral {
-		if let Some(error_translation_key) = do_preflight_ephemeral(&ctx, guild_id).await? {
-			ctx.say(format_message!(resolved_language, error_translation_key))
-				.await?;
-			return Ok(());
-		}
+	if ephemeral && let Some(error_translation_key) = do_preflight_ephemeral(&ctx, guild_id).await?
+	{
+		ctx.say(format_message!(resolved_language, error_translation_key))
+			.await?;
+		return Ok(());
 	}
 
 	super::ensure_guild_exists(guild_id, db).await?;

scripty_commands/src/cmds/config/default_settings/new_thread.rs

@@ -21,12 +21,12 @@ pub async fn config_default_settings_new_thread(
 		scripty_i18n::get_resolved_language(ctx.author().id.get(), Some(guild_id.get())).await;
 	let db = scripty_db::get_db();
 
-	if new_thread {
-		if let Some(error_translation_key) = do_preflight_new_thread(&ctx, guild_id).await? {
-			ctx.say(format_message!(resolved_language, error_translation_key))
-				.await?;
-			return Ok(());
-		}
+	if new_thread
+		&& let Some(error_translation_key) = do_preflight_new_thread(&ctx, guild_id).await?
+	{
+		ctx.say(format_message!(resolved_language, error_translation_key))
+			.await?;
+		return Ok(());
 	}
 
 	super::ensure_guild_exists(guild_id, db).await?;

scripty_commands/src/cmds/config/language.rs

@@ -35,15 +35,15 @@ pub async fn config_server_language(
 		)
 		.fetch_optional(scripty_db::get_db())
 		.await?;
-		if let Some(row) = res {
-			if row.translate {
-				ctx.reply(format_message!(
-					resolved_language,
-					"guild-language-set-failure-translate-enabled"
-				))
-				.await?;
-				return Ok(());
-			}
+		if let Some(row) = res
+			&& row.translate
+		{
+			ctx.reply(format_message!(
+				resolved_language,
+				"guild-language-set-failure-translate-enabled"
+			))
+			.await?;
+			return Ok(());
 		}
 	}
 

scripty_commands/src/cmds/config/prefix.rs

@@ -23,12 +23,12 @@ pub async fn config_prefix(
 	// if the prefix is 0 characters turn it into None
 	prefix.take_if(|p| p.is_empty());
 
-	if let Some(ref prefix) = prefix {
-		if prefix.len() > 8 {
-			ctx.say(format_message!(resolved_language, "config-prefix-too-long"))
-				.await?;
-			return Ok(());
-		}
+	if let Some(ref prefix) = prefix
+		&& prefix.len() > 8
+	{
+		ctx.say(format_message!(resolved_language, "config-prefix-too-long"))
+			.await?;
+		return Ok(());
 	}
 
 	let db = scripty_db::get_db();