Skip to content

refactor: replace trait fn bounds with impl AsyncFn #1657

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 2 commits into
base: master
Choose a base branch
from
Open

refactor: replace trait fn bounds with impl AsyncFn #1657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3833e0d
Standardize async callback patterns using AsyncFnOnce
alwayys-afk Oct 10, 2025
8f43a0c
Merge branch 'master' into updating-async-fn-constraint
kaplanelad Oct 19, 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
4 changes: 2 additions & 2 deletions loco-gen/src/templates/controller/api/test.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use serial_test::serial;
#[tokio::test]
#[serial]
async fn can_get_{{ name | plural | snake_case }}() {
request::<App, _, _>(|request, _ctx| async move {
request::<App>(|request, _ctx| async move {
let res = request.get("/api/{{ name | plural | snake_case }}/").await;
assert_eq!(res.status_code(), 200);

Expand All @@ -29,7 +29,7 @@ async fn can_get_{{ name | plural | snake_case }}() {
#[tokio::test]
#[serial]
async fn can_get_{{action}}() {
request::<App, _, _>(|request, _ctx| async move {
request::<App>(|request, _ctx| async move {
let res = request.get("/{{ name | plural | snake_case }}/{{action}}").await;
assert_eq!(res.status_code(), 200);
})
Expand Down
2 changes: 1 addition & 1 deletion loco-gen/src/templates/scaffold/api/test.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use serial_test::serial;
#[tokio::test]
#[serial]
async fn can_get_{{ name | plural | snake_case }}() {
request::<App, _, _>(|request, _ctx| async move {
request::<App>(|request, _ctx| async move {
let res = request.get("/api/{{ name | plural | snake_case }}/").await;
assert_eq!(res.status_code(), 200);

Expand Down
52 changes: 21 additions & 31 deletions src/testing/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ pub async fn boot_test_unique_port<H: Hooks>(port: Option<i32>) -> Result<BootRe
}

#[allow(clippy::future_not_send)]
async fn request_internal<F, Fut>(callback: F, boot: &BootResult, test_server_config: RequestConfig)
where
F: FnOnce(TestServer, AppContext) -> Fut,
Fut: std::future::Future<Output = ()>,
{
async fn request_internal(
callback: impl AsyncFnOnce(TestServer, AppContext),
boot: &BootResult,
test_server_config: RequestConfig,
) {
let routes = boot.router.clone().unwrap();
let server = TestServer::new_with_config(
routes.into_make_service_with_connect_info::<SocketAddr>(),
Expand Down Expand Up @@ -292,19 +292,15 @@ where
/// #[tokio::test]
/// #[serial]
/// async fn can_register() {
/// request::<App, _, _>(|request, ctx| async move {
/// request::<App>(|request, ctx| async move {
/// let response = request.post("/auth/register").json(&serde_json::json!({})).await;
/// })
/// .await;
/// }
/// ```
#[allow(clippy::future_not_send)]
pub async fn request<H: Hooks, F, Fut>(callback: F)
where
F: FnOnce(TestServer, AppContext) -> Fut,
Fut: std::future::Future<Output = ()>,
{
request_with_config::<H, F, Fut>(RequestConfig::default(), callback).await;
pub async fn request<H: Hooks>(callback: impl AsyncFnOnce(TestServer, AppContext)) {
request_with_config::<H>(RequestConfig::default(), callback).await;
}
/// Executes a test server request with a created database using the provided callback.
///
Expand All @@ -316,7 +312,7 @@ where
///
/// #[tokio::test]
/// async fn can_register() {
/// request_with_create_db::<App, _, _>(|request, ctx| async move {
/// request_with_create_db::<App>(|request, ctx| async move {
/// let response = request.post("/auth/register").json(&serde_json::json!({})).await;
/// })
/// .await;
Expand All @@ -328,12 +324,8 @@ where
/// initialize the test app
#[allow(clippy::future_not_send)]
#[cfg(feature = "with-db")]
pub async fn request_with_create_db<H: Hooks, F, Fut>(callback: F)
where
F: FnOnce(TestServer, AppContext) -> Fut,
Fut: std::future::Future<Output = ()>,
{
request_config_with_create_db::<H, F, Fut>(RequestConfig::default(), callback).await;
pub async fn request_with_create_db<H: Hooks>(callback: impl AsyncFnOnce(TestServer, AppContext)) {
request_config_with_create_db::<H>(RequestConfig::default(), callback).await;
}

/// Executes a test server request using a custom [`RequestConfig`].
Expand All @@ -352,13 +344,12 @@ where
/// let response = request.get("/endpoint").await;
/// });
/// ```
pub async fn request_with_config<H: Hooks, F, Fut>(config: RequestConfig, callback: F)
where
F: FnOnce(TestServer, AppContext) -> Fut,
Fut: std::future::Future<Output = ()>,
{
pub async fn request_with_config<H: Hooks>(
config: RequestConfig,
callback: impl AsyncFnOnce(TestServer, AppContext),
) {
let boot: BootResult = boot_test::<H>().await.unwrap();
request_internal::<F, Fut>(callback, &boot, config).await;
request_internal(callback, &boot, config).await;
}

/// Executes a test server request with a created database using a custom [`RequestConfig`].
Expand All @@ -379,11 +370,10 @@ where
/// ```
#[allow(clippy::future_not_send)]
#[cfg(feature = "with-db")]
pub async fn request_config_with_create_db<H: Hooks, F, Fut>(config: RequestConfig, callback: F)
where
F: FnOnce(TestServer, AppContext) -> Fut,
Fut: std::future::Future<Output = ()>,
{
pub async fn request_config_with_create_db<H: Hooks>(
config: RequestConfig,
callback: impl AsyncFnOnce(TestServer, AppContext),
) {
let boot_wrapper: BootResultWrapper = boot_test_with_create_db::<H>().await.unwrap();
request_internal::<F, Fut>(callback, &boot_wrapper.inner, config).await;
request_internal(callback, &boot_wrapper.inner, config).await;
}
Loading