Skip to content

Commit 3e03a5a

Browse files
mkrasnitskiGnomedDev
authored andcommitted
Fix clippy warning on next (#3078)
Fixes CI failure
1 parent a4decf2 commit 3e03a5a

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

src/collector/mod.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ make_specific_collector!(
178178
// - filter expression (this expressoin must return true to let the event through)
179179
author_id: UserId => interaction.user.id == *author_id,
180180
channel_id: ChannelId => interaction.channel_id == *channel_id,
181-
guild_id: GuildId => interaction.guild_id.map_or(true, |x| x == *guild_id),
181+
guild_id: GuildId => interaction.guild_id.is_none_or(|x| x == *guild_id),
182182
message_id: MessageId => interaction.message.id == *message_id,
183183
custom_ids: FixedArray<FixedString> => custom_ids.contains(&interaction.data.custom_id),
184184
);
@@ -190,17 +190,17 @@ make_specific_collector!(
190190
}) => interaction,
191191
author_id: UserId => interaction.user.id == *author_id,
192192
channel_id: ChannelId => interaction.channel_id == *channel_id,
193-
guild_id: GuildId => interaction.guild_id.map_or(true, |g| g == *guild_id),
194-
message_id: MessageId => interaction.message.as_ref().map_or(true, |m| m.id == *message_id),
193+
guild_id: GuildId => interaction.guild_id.is_none_or(|g| g == *guild_id),
194+
message_id: MessageId => interaction.message.as_ref().is_none_or(|m| m.id == *message_id),
195195
custom_ids: Vec<FixedString> => custom_ids.contains(&interaction.data.custom_id),
196196
);
197197
make_specific_collector!(
198198
ReactionCollector, Reaction,
199199
CollectReactions, collect_reactions,
200200
Event::ReactionAdd(ReactionAddEvent { reaction }) => reaction,
201-
author_id: UserId => reaction.user_id.map_or(true, |a| a == *author_id),
201+
author_id: UserId => reaction.user_id.is_none_or(|a| a == *author_id),
202202
channel_id: ChannelId => reaction.channel_id == *channel_id,
203-
guild_id: GuildId => reaction.guild_id.map_or(true, |g| g == *guild_id),
203+
guild_id: GuildId => reaction.guild_id.is_none_or(|g| g == *guild_id),
204204
message_id: MessageId => reaction.message_id == *message_id,
205205
);
206206
make_specific_collector!(
@@ -209,5 +209,5 @@ make_specific_collector!(
209209
Event::MessageCreate(MessageCreateEvent { message }) => message,
210210
author_id: UserId => message.author.id == *author_id,
211211
channel_id: ChannelId => message.channel_id == *channel_id,
212-
guild_id: GuildId => message.guild_id.map_or(true, |g| g == *guild_id),
212+
guild_id: GuildId => message.guild_id.is_none_or(|g| g == *guild_id),
213213
);

src/gateway/sharding/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ impl Shard {
432432
}
433433

434434
let resume = num
435-
.map_or(true, |x| x != close_codes::AUTHENTICATION_FAILED && self.session_id.is_some());
435+
.is_none_or(|x| x != close_codes::AUTHENTICATION_FAILED && self.session_id.is_some());
436436

437437
Ok(Some(if resume {
438438
ShardAction::Reconnect(ReconnectType::Resume)

src/gateway/sharding/shard_runner.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,11 +178,11 @@ impl ShardRunner {
178178
let can_dispatch = self
179179
.event_handler
180180
.as_ref()
181-
.map_or(true, |handler| handler.filter_event(&context, &event))
181+
.is_none_or(|handler| handler.filter_event(&context, &event))
182182
&& self
183183
.raw_event_handler
184184
.as_ref()
185-
.map_or(true, |handler| handler.filter_event(&context, &event));
185+
.is_none_or(|handler| handler.filter_event(&context, &event));
186186

187187
if can_dispatch {
188188
#[cfg(feature = "collector")]

src/model/guild/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ impl Guild {
597597

598598
for member in &self.members {
599599
if &*member.user.name == username
600-
&& discrim.map_or(true, |d| member.user.discriminator == d)
600+
&& discrim.is_none_or(|d| member.user.discriminator == d)
601601
{
602602
return Some(member);
603603
}

0 commit comments

Comments
 (0)