chore: fmt, bump 0.40.0

matteopolak · matteopolak · commit 1043bcaa5deb · 2024-03-26T19:26:29.000-04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "api"
-version = "0.39.0"
+version = "0.40.0"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["Matthew Polak <contact@matteopolak.com>"]
diff --git a/crates/api/src/player/mod.rs b/crates/api/src/player/mod.rs
@@ -443,8 +443,7 @@ impl Player {
 									.skin
 									.metadata
 									.as_ref()
-									.map(|m| m.model == "slim")
-									.unwrap_or_default(),
+									.is_some_and(|m| m.model == "slim"),
 							)
 						}) else {
 							return Cow::Borrowed(&*DEFAULT_SKIN);
diff --git a/crates/derive/Cargo.toml b/crates/derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "derive"
-version = "0.39.0"
+version = "0.40.0"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["Matthew Polak <contact@matteopolak.com>"]
diff --git a/crates/statpixel/Cargo.toml b/crates/statpixel/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "statpixel"
-version = "0.39.0"
+version = "0.40.0"
 edition = "2021"
 license = "GPL-3.0"
 authors = ["Matthew Polak <contact@matteopolak.com>"]
diff --git a/crates/statpixel/src/commands/at/run.rs b/crates/statpixel/src/commands/at/run.rs
@@ -198,9 +198,12 @@ pub async fn guild_command(
 	guild.increase_searches(ctx).await?;
 
 	let png: Option<Cow<_>> = if let snapshot::guild::Status::Found((ref guild, _)) = status {
-		let guilds =
-			get_snapshots_multiple_of_weekday(ctx, guild, Utc::now() - chrono::Duration::try_days(30).unwrap())
-				.await?;
+		let guilds = get_snapshots_multiple_of_weekday(
+			ctx,
+			guild,
+			Utc::now() - chrono::Duration::try_days(30).unwrap(),
+		)
+		.await?;
 		let monthly_xp = get_monthly_xp(guild, &guilds);
 
 		let daily_xp = guild.members.iter().map(|g| g.xp_history[1].1).sum::<u32>();
diff --git a/crates/statpixel/src/commands/builder/mod.rs b/crates/statpixel/src/commands/builder/mod.rs
@@ -57,7 +57,8 @@ pub fn create_components<'c>(
 							.description(tr(ctx, "right-description")),
 						CreateSelectMenuOption::new(tr(ctx, "right-start"), "right_start")
 							.description(tr(ctx, "right-start-description")),
-					].into(),
+					]
+					.into(),
 				},
 			)
 			.placeholder(match state.next.location {
@@ -83,7 +84,8 @@ pub fn create_components<'c>(
 							.description(tr(ctx, "bubble-description")),
 						CreateSelectMenuOption::new(tr(ctx, "subtitle"), "subtitle")
 							.description(tr(ctx, "subtitle-description")),
-					].into(),
+					]
+					.into(),
 				},
 			)
 			.placeholder(match state.next.kind {
@@ -116,7 +118,8 @@ pub fn create_components<'c>(
 						CreateSelectMenuOption::new(tr(ctx, "red"), "RED"),
 						CreateSelectMenuOption::new(tr(ctx, "white"), "WHITE"),
 						CreateSelectMenuOption::new(tr(ctx, "yellow"), "YELLOW"),
-					].into(),
+					]
+					.into(),
 				},
 			)
 			.placeholder(match state.next.colour {
@@ -493,7 +496,9 @@ pub async fn modal_handler(
 			id.state.shapes.push(builder::Shape {
 				location: *location,
 				colour: *colour,
-				data: ShapeData::Subtitle { text: subtitle.to_string() },
+				data: ShapeData::Subtitle {
+					text: subtitle.to_string(),
+				},
 			});
 		}
 		(
diff --git a/crates/statpixel/src/commands/guild/image.rs b/crates/statpixel/src/commands/guild/image.rs
@@ -273,9 +273,12 @@ pub async fn general(
 	guild: &Guild,
 	background: Option<Color>,
 ) -> Result<Cow<'static, [u8]>, Error> {
-	let guilds =
-		get_snapshots_multiple_of_weekday(ctx, guild, Utc::now() - chrono::Duration::try_days(30).unwrap())
-			.await?;
+	let guilds = get_snapshots_multiple_of_weekday(
+		ctx,
+		guild,
+		Utc::now() - chrono::Duration::try_days(30).unwrap(),
+	)
+	.await?;
 	let monthly_xp = get_monthly_xp(guild, &guilds);
 
 	let members = futures::stream::iter(
@@ -451,9 +454,12 @@ pub async fn member(
 	player: &Player,
 	background: Option<Color>,
 ) -> Result<Cow<'static, [u8]>, Error> {
-	let guilds =
-		get_snapshots_multiple_of_weekday(ctx, guild, Utc::now() - chrono::Duration::try_days(30).unwrap())
-			.await?;
+	let guilds = get_snapshots_multiple_of_weekday(
+		ctx,
+		guild,
+		Utc::now() - chrono::Duration::try_days(30).unwrap(),
+	)
+	.await?;
 
 	let member_xp = get_member_monthly_xp(guild, &guilds);
 	let member = player.get_display_string(ctx).await?;
diff --git a/crates/statpixel/src/commands/guild/mod.rs b/crates/statpixel/src/commands/guild/mod.rs
@@ -201,7 +201,9 @@ async fn top(
 		name,
 		player,
 		uuid,
-		days.map_or(chrono::Duration::try_days(30).unwrap(), |d| chrono::Duration::try_days(d).unwrap()),
+		days.map_or(chrono::Duration::try_days(30).unwrap(), |d| {
+			chrono::Duration::try_days(d).unwrap()
+		}),
 		limit,
 		None,
 	)
diff --git a/crates/statpixel/src/commands/skyblock/image.rs b/crates/statpixel/src/commands/skyblock/image.rs
@@ -812,7 +812,7 @@ pub async fn networth(
 	let default = (&Category::default(), vec![]);
 
 	for i in categories.chunks(2) {
-		let (left, left_items) = i.get(0).unwrap();
+		let (left, left_items) = i.first().unwrap();
 		let (right, right_items) = i.get(1).unwrap_or(&default);
 
 		let rows = left_items.len().max(right_items.len());
diff --git a/crates/statpixel/src/commands/snapshot/mod.rs b/crates/statpixel/src/commands/snapshot/mod.rs
@@ -265,4 +265,8 @@ macro_rules! commands {
 
 commands!(daily, ::chrono::Duration::try_days(1).unwrap(), "daily");
 commands!(weekly, ::chrono::Duration::try_weeks(1).unwrap(), "weekly");
-commands!(monthly, ::chrono::Duration::try_days(30).unwrap(), "monthly");
+commands!(
+	monthly,
+	::chrono::Duration::try_days(30).unwrap(),
+	"monthly"
+);
diff --git a/crates/statpixel/src/id/image.rs b/crates/statpixel/src/id/image.rs
@@ -374,7 +374,8 @@ pub async fn map(
 						family,
 						&guild,
 						limit.unwrap_or(30),
-						Utc::now() - nanos.map_or(Duration::try_days(30).unwrap(), Duration::nanoseconds),
+						Utc::now()
+							- nanos.map_or(Duration::try_days(30).unwrap(), Duration::nanoseconds),
 						background,
 					)
 					.await
diff --git a/crates/statpixel/src/id/mod.rs b/crates/statpixel/src/id/mod.rs
@@ -193,7 +193,10 @@ pub async fn map(ctx: &Context<'_>, id: Id) -> Result<(), Error> {
 						None,
 						None,
 						member_id,
-						nanos.map_or(chrono::Duration::try_days(30).unwrap(), chrono::Duration::nanoseconds),
+						nanos.map_or(
+							chrono::Duration::try_days(30).unwrap(),
+							chrono::Duration::nanoseconds,
+						),
 						limit.unwrap_or(30),
 						Some(uuid),
 					)
diff --git a/crates/statpixel/src/main.rs b/crates/statpixel/src/main.rs
@@ -1,6 +1,9 @@
 #![warn(clippy::pedantic)]
 #![allow(clippy::cast_possible_wrap)]
 #![allow(clippy::wildcard_imports)]
+// diesel_async::RunQueryDsl overshadows <[]>::first
+// and overflows the requirement evaluator
+#![allow(clippy::get_first)]
 #![feature(let_chains)]
 #![feature(exclusive_range_pattern)]
 #![feature(iter_intersperse)]
@@ -331,7 +334,7 @@ async fn event_handler(
 			interaction: Interaction::Modal(interaction),
 		} => {
 			let Some(id) = api::id::decode(&interaction.data.custom_id) else {
-				let ctx = context::Context::from_modal(&ctx, data, interaction);
+				let ctx = context::Context::from_modal(ctx, data, interaction);
 				return Ok(ctx.send(deprecated_interaction(&ctx)).await?);
 			};
 
@@ -340,7 +343,7 @@ async fn event_handler(
 					if let Err(e) =
 						commands::builder::modal_handler(ctx, interaction, data, id).await
 					{
-						let ctx = context::Context::from_modal(&ctx, data, interaction);
+						let ctx = context::Context::from_modal(ctx, data, interaction);
 						util::error(&ctx, e).await;
 					}
 				}
@@ -350,7 +353,7 @@ async fn event_handler(
 		FullEvent::InteractionCreate {
 			interaction: Interaction::Component(interaction),
 		} => {
-			let ctx = context::Context::from_component(&ctx, data, interaction);
+			let ctx = context::Context::from_component(ctx, data, interaction);
 			let values = match &interaction.data.kind {
 				serenity::ComponentInteractionDataKind::StringSelect { ref values } => values,
 				serenity::ComponentInteractionDataKind::Button => {
diff --git a/crates/statpixel/src/server/auth.rs b/crates/statpixel/src/server/auth.rs
@@ -216,7 +216,7 @@ pub async fn update_me(
 	Ok(StatusCode::OK)
 }
 
-fn log_internal_error(e: impl std::error::Error + std::fmt::Debug) -> StatusCode {
+fn log_internal_error(e: impl std::error::Error) -> StatusCode {
 	tracing::error!(error = %e, "internal error");
 
 	StatusCode::INTERNAL_SERVER_ERROR
diff --git a/crates/statpixel/src/server/vendor.rs b/crates/statpixel/src/server/vendor.rs
@@ -14,26 +14,25 @@ pub async fn post(
 	let data = decode(&body_bytes[..]).map_err(|_| StatusCode::BAD_REQUEST)?;
 	let hash = fxhash::hash64(&body_bytes[..]) as i64;
 
-	let prev_hash = diesel::update(
-		schedule::table
-			.filter(schedule::uuid.eq(data.uuid))
-			.filter(schedule::vendor_update_at.lt(Utc::now() - Duration::try_minutes(15).unwrap())),
-	)
-	.set((
-		schedule::vendor_update_at.eq(Utc::now()),
-		schedule::vendor_prev_hash.eq(schedule::vendor_hash),
-		schedule::vendor_hash.eq(hash),
-	))
-	.returning(schedule::vendor_prev_hash)
-	.get_result::<Option<i64>>(
-		&mut state
-			.pool
-			.get()
-			.await
-			.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?,
-	)
-	.await
-	.map_err(|_| StatusCode::NOT_FOUND)?;
+	let prev_hash =
+		diesel::update(schedule::table.filter(schedule::uuid.eq(data.uuid)).filter(
+			schedule::vendor_update_at.lt(Utc::now() - Duration::try_minutes(15).unwrap()),
+		))
+		.set((
+			schedule::vendor_update_at.eq(Utc::now()),
+			schedule::vendor_prev_hash.eq(schedule::vendor_hash),
+			schedule::vendor_hash.eq(hash),
+		))
+		.returning(schedule::vendor_prev_hash)
+		.get_result::<Option<i64>>(
+			&mut state
+				.pool
+				.get()
+				.await
+				.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?,
+		)
+		.await
+		.map_err(|_| StatusCode::NOT_FOUND)?;
 
 	diesel::insert_into(snapshot::table)
 		.values((
diff --git a/crates/statpixel/src/snapshot/guild/mod.rs b/crates/statpixel/src/snapshot/guild/mod.rs
@@ -229,7 +229,8 @@ pub async fn insert(ctx: &Context<'_>, guild: &Guild) -> Result<(), Error> {
 						// Schedule the first update for one hour from now.
 						// The first few updates should be more frequent to calculate the
 						// timezone of the player.
-						guild_schedule::update_at.eq(now + chrono::Duration::try_hours(12).unwrap()),
+						guild_schedule::update_at
+							.eq(now + chrono::Duration::try_hours(12).unwrap()),
 						// Set the number of snapshots to 1, since we just inserted one.
 						guild_schedule::snapshots.eq(1),
 						guild_schedule::hash.eq(hash),
diff --git a/crates/statpixel/src/snapshot/user/mod.rs b/crates/statpixel/src/snapshot/user/mod.rs
@@ -91,7 +91,8 @@ async fn update(
 		|| (snapshots - CALCULATION_PERIOD_SNAPSHOTS) % FULL_PERIOD_SNAPSHOTS
 			> REGULAR_PERIOD_SNAPSHOTS
 	{
-		let increase = chrono::Duration::try_hours(i64::from(CALCULATION_WEEK_TIME_STEP_HOURS)).unwrap();
+		let increase =
+			chrono::Duration::try_hours(i64::from(CALCULATION_WEEK_TIME_STEP_HOURS)).unwrap();
 		let next = timestamp + increase;
 
 		if next > now {
@@ -526,7 +527,8 @@ pub async fn insert(ctx: &Context<'_>, player: &Player, data: &Data) -> Result<(
 						// Schedule the first update for one hour from now.
 						// The first few updates should be more frequent to calculate the
 						// timezone of the player.
-						schedule::update_at.eq(Utc::now() + chrono::Duration::try_hours(3).unwrap()),
+						schedule::update_at
+							.eq(Utc::now() + chrono::Duration::try_hours(3).unwrap()),
 						// Set the number of snapshots to 1, since we just inserted one.
 						schedule::snapshots.eq(1),
 						schedule::hash.eq(hash),
@@ -586,7 +588,8 @@ pub async fn insert_with_session(
 						// Schedule the first update for one hour from now.
 						// The first few updates should be more frequent to calculate the
 						// timezone of the player.
-						schedule::update_at.eq(Utc::now() + chrono::Duration::try_hours(3).unwrap()),
+						schedule::update_at
+							.eq(Utc::now() + chrono::Duration::try_hours(3).unwrap()),
 						// Set the number of snapshots to 1, since we just inserted one.
 						schedule::snapshots.eq(1),
 						schedule::hash.eq(hash),
diff --git a/crates/statpixel/src/util.rs b/crates/statpixel/src/util.rs
@@ -38,7 +38,7 @@ where
 	)
 }
 
-pub fn deprecated_interaction<'c>(ctx: &'c impl GetLocale) -> CreateReply<'c> {
+pub fn deprecated_interaction(ctx: &impl GetLocale) -> CreateReply<'_> {
 	CreateReply::new().embed(
 		serenity::CreateEmbed::new()
 			.title(tr(ctx, "deprecated-interaction"))
@@ -47,7 +47,7 @@ pub fn deprecated_interaction<'c>(ctx: &'c impl GetLocale) -> CreateReply<'c> {
 	)
 }
 
-pub fn invalid_identifier<'c>(ctx: &'c impl GetLocale) -> CreateReply<'c> {
+pub fn invalid_identifier(ctx: &impl GetLocale) -> CreateReply<'_> {
 	CreateReply::new().embed(
 		serenity::CreateEmbed::new()
 			.title(tr(ctx, "invalid-identifier"))
