Skip to content

Fix clippy warnings on current #3432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: current
Choose a base branch
from
+3 −6
Open

Fix clippy warnings on current #3432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/client/event_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ macro_rules! event_handler {
$( #[deprecated = $deprecated] )?
async fn $method_name(&self, $($context: Context,)? $( $arg_name: $arg_type ),*) {
// Suppress unused argument warnings
#[allow(clippy::double_parens)]
drop(( $($context,)? $($arg_name),* ))
Comment on lines +24 to 25
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#[allow(clippy::double_parens)]
drop(( $($context,)? $($arg_name),* ))
drop(( $($context,)? $($arg_name,)* ))

This way the macro will produce 1-tuples instead of parenthesized single values.

}
)*
Expand Down
8 changes: 2 additions & 6 deletions src/gateway/bridge/shard_queuer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,9 @@ impl ShardQueuer {
let duration = Duration::from_secs(WAIT_BETWEEN_BOOTS_IN_SECONDS);
let elapsed = instant.elapsed();

if elapsed >= duration {
return;
if let Some(to_sleep) = duration.checked_sub(elapsed) {
sleep(to_sleep).await;
}

let to_sleep = duration - elapsed;

sleep(to_sleep).await;
}

#[instrument(skip(self))]
Expand Down
Loading