Fix some Clippy lints

Author: tazz4843

scripty_audio_handler/src/audio_handler.rs

@@ -24,7 +24,15 @@ use songbird::{Event, EventContext, EventHandler};
 
 use crate::{
 	error::Error,
-	events::*,
+	events::{
+		VoiceTickContext,
+		client_disconnect,
+		driver_connect,
+		driver_disconnect,
+		rtp_packet,
+		speaking_state_update,
+		voice_tick,
+	},
 	types::{
 		ActiveUserSet,
 		NextUserList,
@@ -117,7 +125,7 @@ impl AudioHandler {
 			context,
 			premium_level: Arc::new(AtomicU8::new(0)),
 			verbose: Arc::new(AtomicBool::new(false)),
-			language: Arc::new(Default::default()),
+			language: Arc::new(RwLock::new(String::new())),
 			transcript_results: record_transcriptions.then(|| Arc::new(RwLock::new(Vec::new()))),
 			seen_users: record_transcriptions
 				.then(|| Arc::new(DashSet::with_hasher(RandomState::new()))),
@@ -153,7 +161,7 @@ impl AudioHandler {
 						}
 						debug!(%guild_id, "got request to reload config for this call");
 					}
-					_ = tokio::time::sleep(RELOAD_TIME) => {}
+					() = tokio::time::sleep(RELOAD_TIME) => {}
 				}
 				if let Err(e) = t2.reload_config().await {
 					error!("failed to reload config: {:?}", e);

scripty_audio_handler/src/disconnect.rs

@@ -15,7 +15,7 @@ pub async fn disconnect_from_vc(ctx: &Context, guild_id: GuildId) -> Result<bool
 		Err(e) => Err(e.into()),
 	};
 
-	get_data(ctx).existing_calls.force_remove_guild(&guild_id);
+	let _ = get_data(ctx).existing_calls.force_remove_guild(&guild_id);
 
 	let existing = super::AUTO_LEAVE_TASKS
 		.get_or_init(|| DashMap::with_hasher(ahash::RandomState::default()))

scripty_audio_handler/src/events/voice_tick.rs

@@ -440,8 +440,8 @@ async fn handle_speakers(ssrc_state: Arc<SsrcMaps>, metrics: Arc<Metrics>, voice
 			// feed audio to transcription stream
 			if let Some(stream) = ssrc_state.ssrc_stream_map.get(&ssrc) {
 				if let Err(e) = stream.feed_audio(audio) {
-					warn!("failed to feed audio packet: {}", e)
-				};
+					warn!("failed to feed audio packet: {}", e);
+				}
 				trace!(?ssrc, "done processing pkt");
 			} else {
 				warn!(?ssrc, "no stream found for ssrc");
@@ -505,7 +505,7 @@ async fn finalize_stream<'a>(
 	};
 	let Some((user_details, avatar_url)) = user_data_map
 		.get(&ssrc)
-		.map(|x| (x.value().0.to_owned(), x.value().1.to_owned()))
+		.map(|x| (x.value().0.clone(), x.value().1.clone()))
 	else {
 		warn!("no user details for ssrc {}", ssrc);
 		return None;

scripty_automod/src/db.rs

@@ -2,7 +2,7 @@ use crate::types::{AutomodRule, AutomodServerConfig};
 
 pub async fn get_guild_config(guild_id: u64) -> Result<Option<AutomodServerConfig>, sqlx::Error> {
 	let db = scripty_db::get_db();
-	let mut cfg = match sqlx::query!(
+	let Some(mut cfg) = sqlx::query!(
 		"SELECT * FROM automod_config WHERE guild_id = $1",
 		guild_id as i64
 	)
@@ -18,9 +18,8 @@ pub async fn get_guild_config(guild_id: u64) -> Result<Option<AutomodServerConfi
 			row.log_channel_id as u64,
 			row.log_recording,
 		)
-	}) {
-		Some(cfg) => cfg,
-		None => return Ok(None),
+	}) else {
+		return Ok(None);
 	};
 
 	// fetch rules

scripty_bot/src/lib.rs

@@ -31,9 +31,9 @@ pub async fn entrypoint() {
 		.options(framework_opts::get_framework_opts())
 		.build();
 	let data = Arc::new(Data::new());
-	let Ok(_) = CLIENT_DATA.set(data.clone()) else {
-		panic!("client data set more than once: bug?")
-	};
+	if CLIENT_DATA.set(data.clone()).is_err() {
+		unreachable!("client data set more than once: bug?")
+	}
 
 	let songbird = scripty_audio_handler::Songbird::serenity_from_config(
 		scripty_audio_handler::get_songbird_config(),
@@ -48,7 +48,7 @@ pub async fn entrypoint() {
 	}
 	let http = http.build();
 	if let Some(ratelimiter) = &http.ratelimiter {
-		ratelimiter.set_ratelimit_callback(Box::new(handler::ratelimit))
+		ratelimiter.set_ratelimit_callback(Box::new(handler::ratelimit));
 	}
 
 	let mut client =

scripty_bot_utils/src/error/error_type.rs

@@ -17,7 +17,9 @@ pub struct Error {
 
 impl Debug for Error {
 	fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-		f.debug_struct("Error").field("err", &self.err).finish()
+		f.debug_struct("Error")
+			.field("err", &self.err)
+			.finish_non_exhaustive()
 	}
 }
 

scripty_bot_utils/src/handler/normal/voice_state_update.rs

@@ -28,12 +28,9 @@ pub async fn voice_state_update(ctx: &Context, new: &VoiceState) {
 	if let Some(cid) = get_voice_channel_id(guild_id).await {
 		// GuildRef forces a block here to prevent hold over await
 		{
-			let guild = match guild_id.to_guild_cached(&ctx.cache) {
-				Some(g) => g,
-				None => {
-					warn!("guild id {} not found in cache", guild_id);
-					return;
-				}
+			let Some(guild) = guild_id.to_guild_cached(&ctx.cache) else {
+				warn!("guild id {} not found in cache", guild_id);
+				return;
 			};
 
 			// iterate through voice states in the guild
@@ -81,7 +78,7 @@ pub async fn voice_state_update(ctx: &Context, new: &VoiceState) {
 		.map(|x| x.map(|y| y.auto_join))
 		{
 			Ok(Some(true)) => {
-				debug!(%guild_id, "guild has auto join enabled, proceeding with join")
+				debug!(%guild_id, "guild has auto join enabled, proceeding with join");
 			}
 			Ok(Some(false)) => {
 				// auto join is not enabled, so we don't need to do anything
@@ -111,17 +108,14 @@ pub async fn voice_state_update(ctx: &Context, new: &VoiceState) {
 		if target_user.bot() {
 			debug!(%guild_id, "user {} is a bot, not continuing with join", target_user.id);
 			return;
-		};
+		}
 
 		// now we need to check the voice channel the user is joining
 		// discord doesn't give us the channel id, so we need to get it from the guild's voice states
 		let vs = {
-			let guild = match guild_id.to_guild_cached(&ctx.cache) {
-				Some(g) => g,
-				None => {
-					warn!(%guild_id, "guild not found in cache");
-					return;
-				}
+			let Some(guild) = guild_id.to_guild_cached(&ctx.cache) else {
+				warn!(%guild_id, "guild not found in cache");
+				return;
 			};
 
 			// fetch the user's voice state

scripty_bot_utils/src/prefix_handling.rs

@@ -44,7 +44,7 @@ async fn _dynamic_prefix(
 			Some(prefix)
 		}
 	})
-	.unwrap_or_else(|| scripty_config::get_config().prefix.to_owned());
+	.unwrap_or_else(|| scripty_config::get_config().prefix.clone());
 
 	scripty_redis::run_transaction::<()>("SETEX", |cmd| {
 		cmd.arg(format!("prefix_{{{}}}", guild_id.get()))

scripty_commands/src/cmds/admin/cache_info.rs

@@ -45,7 +45,7 @@ pub async fn cache_info(ctx: Context<'_>) -> Result<(), Error> {
 				is_collection: false,
 				value: format!("Size: `{size}b`"),
 			});
-		};
+		}
 	}
 
 	fields.sort_by_key(|field| field.size);

scripty_commands/src/cmds/admin/guild_check.rs

@@ -43,12 +43,9 @@ pub async fn check_guilds(ctx: Context<'_>, specified_ratio: f64) -> Result<(),
 	let mut guild_warnings: Vec<(String, u64, f64)> = Vec::new();
 
 	for guild in ctx.serenity_context().cache.guilds() {
-		let g = match guild.to_guild_cached(ctx.cache()) {
-			Some(g) => g,
-			None => {
-				error_count += 1;
-				continue;
-			}
+		let Some(g) = guild.to_guild_cached(ctx.cache()) else {
+			error_count += 1;
+			continue;
 		};
 
 		let member_count = g.member_count;