Skip to content

Commit 64c3a9c

Browse files
MaxOhnMaxOhn
committed
chore: cargo fmt
1 parent 12f2905 commit 64c3a9c

File tree

26 files changed

+234
-195
lines changed

26 files changed

+234
-195
lines changed

‎bathbot-util/src/buckets.rs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,15 @@ impl Bucket {
8383
let user = self.users.entry(user_id).or_default();
8484

8585
if let Some((timespan, limit)) = self.ratelimit.limit
86-
&& user.tickets + 1 > limit {
87-
if time < (user.set_time + timespan) {
88-
return (user.set_time + timespan) - time;
89-
} else {
90-
user.tickets = 0;
91-
user.set_time = time;
92-
}
86+
&& user.tickets + 1 > limit
87+
{
88+
if time < (user.set_time + timespan) {
89+
return (user.set_time + timespan) - time;
90+
} else {
91+
user.tickets = 0;
92+
user.set_time = time;
9393
}
94+
}
9495

9596
if time < user.last_time + self.ratelimit.delay {
9697
(user.last_time + self.ratelimit.delay) - time

‎bathbot-util/src/html.rs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,11 @@ pub fn decode_html_entities(input: &str) -> String {
9898

9999
if let Ok(code) = code_res
100100
&& code <= 127
101-
&& let Some(ascii_char) = char::from_u32(code) {
102-
result.push(ascii_char);
103-
found = true;
104-
}
101+
&& let Some(ascii_char) = char::from_u32(code)
102+
{
103+
result.push(ascii_char);
104+
found = true;
105+
}
105106
}
106107

107108
if found {

‎bathbot/src/active/impls/bg_game/mod.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,10 @@ impl BackgroundGameSetup {
350350

351351
async fn start(&mut self, channel: Id<ChannelMarker>) -> Result<BuildPage> {
352352
if let Some(game) = Context::bg_games().write(&channel).await.remove()
353-
&& let Err(err) = game.stop() {
354-
warn!(?err, "Failed to stop previous game");
355-
}
353+
&& let Err(err) = game.stop()
354+
{
355+
warn!(?err, "Failed to stop previous game");
356+
}
356357

357358
let mut params = DbMapTagsParams::new(GameMode::Osu);
358359

‎bathbot/src/active/impls/changelog.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,10 @@ impl IActiveMessage for ChangelogPagination {
158158
self.pages.set_index(0);
159159

160160
if self.defer()
161-
&& let Err(err) = component.defer().await.map_err(Report::new) {
162-
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
163-
}
161+
&& let Err(err) = component.defer().await.map_err(Report::new)
162+
{
163+
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
164+
}
164165
}
165166
}
166167
other => {

‎bathbot/src/active/impls/map_search.rs‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -250,35 +250,39 @@ impl IActiveMessage for MapSearchPagination {
250250
self.pages.set_index(0);
251251

252252
if self.defer()
253-
&& let Err(err) = component.defer().await.map_err(Report::new) {
254-
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
255-
}
253+
&& let Err(err) = component.defer().await.map_err(Report::new)
254+
{
255+
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
256+
}
256257
}
257258
"pagination_back" => {
258259
let new_index = self.pages.index().saturating_sub(self.pages.per_page());
259260
self.pages.set_index(new_index);
260261

261262
if self.defer()
262-
&& let Err(err) = component.defer().await.map_err(Report::new) {
263-
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
264-
}
263+
&& let Err(err) = component.defer().await.map_err(Report::new)
264+
{
265+
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
266+
}
265267
}
266268
"pagination_step" => {
267269
let new_index = self.pages.index() + self.pages.per_page();
268270
self.pages.set_index(new_index);
269271

270272
if self.defer()
271-
&& let Err(err) = component.defer().await.map_err(Report::new) {
272-
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
273-
}
273+
&& let Err(err) = component.defer().await.map_err(Report::new)
274+
{
275+
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
276+
}
274277
}
275278
"pagination_end" => {
276279
self.pages.set_index(self.pages.last_index());
277280

278281
if self.defer()
279-
&& let Err(err) = component.defer().await.map_err(Report::new) {
280-
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
281-
}
282+
&& let Err(err) = component.defer().await.map_err(Report::new)
283+
{
284+
return ComponentResult::Err(err.wrap_err("Failed to defer component"));
285+
}
282286
}
283287
other => {
284288
warn!(name = %other, ?component, "Unknown map search pagination component");

‎bathbot/src/active/impls/render/settings.rs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,10 +561,9 @@ impl IActiveMessage for RenderSettingsActive {
561561
other => bail!("Unknown settings modal `{other}`"),
562562
}
563563

564-
if !deferred
565-
&& let Err(err) = modal.defer().await {
566-
warn!("Failed to defer modal");
567-
}
564+
if !deferred && let Err(err) = modal.defer().await {
565+
warn!("Failed to defer modal");
566+
}
568567

569568
let res = Context::replay()
570569
.set_settings(self.msg_owner, &self.settings)

‎bathbot/src/commands/fun/bg_game/mod.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,10 @@ async fn slash_bg(mut command: InteractionCommand) -> Result<()> {
356356
}
357357

358358
if let Some(game) = Context::bg_games().write(&channel).await.remove()
359-
&& let Err(err) = game.stop() {
360-
warn!(?err, "Failed to stop game");
361-
}
359+
&& let Err(err) = game.stop()
360+
{
361+
warn!(?err, "Failed to stop game");
362+
}
362363

363364
let difficulty = difficulty.unwrap_or_default();
364365

‎bathbot/src/commands/osu/badges/query.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,16 @@ pub async fn query_autocomplete(command: &InteractionCommand, name: String) -> R
199199

200200
for badge in badges.iter() {
201201
if badge.name.cow_to_ascii_lowercase().contains(name)
202-
&& let Some(choice) = new_choice(&badge.name) {
203-
choices.push(choice);
204-
}
202+
&& let Some(choice) = new_choice(&badge.name)
203+
{
204+
choices.push(choice);
205+
}
205206

206207
if badge.description.to_ascii_lowercase().contains(name)
207-
&& let Some(choice) = new_choice(&badge.description) {
208-
choices.push(choice);
209-
}
208+
&& let Some(choice) = new_choice(&badge.description)
209+
{
210+
choices.push(choice);
211+
}
210212

211213
if choices.len() >= 25 {
212214
choices.truncate(25);

‎bathbot/src/commands/osu/daily_challenge/today.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,10 @@ impl DailyChallengeDay {
183183
let mut footer_text = format!("Total scores: {total_scores}");
184184

185185
if let Some(osu_id) = osu_id
186-
&& let Some(i) = leaderboard.iter().position(|item| item.user_id == osu_id) {
187-
let _ = write!(footer_text, " • Your position: #{}", i + 1);
188-
}
186+
&& let Some(i) = leaderboard.iter().position(|item| item.user_id == osu_id)
187+
{
188+
let _ = write!(footer_text, " • Your position: #{}", i + 1);
189+
}
189190

190191
let footer = FooterBuilder::new(footer_text);
191192
let start_time = room.starts_at.try_deserialize::<BoxedError>().unwrap();

‎bathbot/src/commands/osu/graphs/bpm.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ pub async fn map_bpm_graph(map: &Beatmap, mods: GameMods, cover_url: &str) -> Re
114114
.timing_points
115115
.first()
116116
.is_some_and(|tp| tp.time > h.start_time)
117-
{
118-
points.push((h.start_time, start_bpm));
119-
}
117+
{
118+
points.push((h.start_time, start_bpm));
119+
}
120120

121121
let iter = map
122122
.timing_points

0 commit comments

Comments
 (0)