Skip to content

fix(gateway, ratelimiting): fix new clippy errors in the tests #2486

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

Merged
vilgotf merged 2 commits into from
Dec 13, 2025
Merged

fix(gateway, ratelimiting): fix new clippy errors in the tests #2486

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed75866
fix clippy errors
AEnterprise Dec 12, 2025
75a398d
allow `unchecked_time_subtraction` in tests
vilgotf Dec 13, 2025
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
6 changes: 3 additions & 3 deletions twilight-gateway/src/ratelimiter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fn nonreserved_commands_per_reset(heartbeat_interval: Duration) -> u8 {
mod tests {
use super::{CommandRatelimiter, PERIOD, nonreserved_commands_per_reset};
use static_assertions::assert_impl_all;
use std::{fmt::Debug, future::poll_fn, time::Duration};
use std::{fmt::Debug, future::poll_fn, ops::Sub, time::Duration};
use tokio::time;

assert_impl_all!(CommandRatelimiter: Debug, Send, Sync);
Expand Down Expand Up @@ -227,7 +227,7 @@ mod tests {
assert_eq!(ratelimiter.available(), 0);

// Should not refill until PERIOD has passed.
time::advance(PERIOD - Duration::from_millis(100)).await;
time::advance(PERIOD.sub(Duration::from_millis(100))).await;
assert_eq!(ratelimiter.available(), 0);

// All should be refilled.
Expand Down Expand Up @@ -286,7 +286,7 @@ mod tests {
}
assert_eq!(ratelimiter.available(), ratelimiter.max() - 5);

time::advance(PERIOD - Duration::from_millis(80)).await;
time::advance(PERIOD.sub(Duration::from_millis(80))).await;
assert_eq!(ratelimiter.available(), ratelimiter.max() - 4);

for _ in 0..4 {
Expand Down
7 changes: 5 additions & 2 deletions twilight-http-ratelimiting/src/actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,10 @@ pub async fn runner(

#[cfg(test)]
mod tests {
use std::time::{Duration, Instant};
use std::{
ops::Sub,
time::{Duration, Instant},
};
use tokio::time;

use crate::{Endpoint, Method, RateLimitHeaders, RateLimiter, actor::GC_INTERVAL};
Expand Down Expand Up @@ -365,7 +368,7 @@ mod tests {
reset_at: Instant::now() + RESET_AFTER,
}));

time::advance(GC_INTERVAL - RESET_AFTER).await;
time::advance(GC_INTERVAL.sub(RESET_AFTER)).await;

rate_limiter
.acquire(ENDPOINT2())
Expand Down