fix: Make query-side AnnotatedQuery forwarders Send-clean - #31
Merged
Conversation
The fetch_*/execute methods on AnnotatedQuery were declared as `async fn`, which generated a coroutine state machine on this crate's side. Inside that coroutine, rustc's auto-trait Send inference had to discharge the HRTB `for<'a> &'a mut DB::Connection: sqlx::Executor<'a, ...>` carried by the IntoAnnotatedExecutor impls – and could not, breaking query-side annotation inside tokio::spawn, axum handlers, and tower::Service-bounded futures. Convert the five forwarders (fetch_optional, fetch_all, fetch_one, execute, execute_many) from `async fn -> T` to `fn -> impl Future<Output = T> + Send + 'e`. The body forwards sqlx's underlying future directly with no `.await`, so no coroutine forms at this layer; Send delegates to sqlx's own already-Send future. The HRTB on the IntoAnnotatedExecutor impls and on impl_executor! is unchanged, and the executor-side surface is unaffected.
|
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## trunk #31 +/- ##
=======================================
Coverage 99.90% 99.90%
=======================================
Files 12 12
Lines 2030 2034 +4
=======================================
+ Hits 2028 2032 +4
Misses 2 2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The fetch_*/execute methods on AnnotatedQuery were declared as
async fn, which generated a coroutine state machine on this crate's side. Inside that coroutine, rustc's auto-trait Send inference had to discharge the HRTBfor<'a> &'a mut DB::Connection: sqlx::Executor<'a, ...>carried by the IntoAnnotatedExecutor impls – and could not, breaking query-side annotation inside tokio::spawn, axum handlers, and tower::Service-bounded futures.Convert the five forwarders (fetch_optional, fetch_all, fetch_one, execute, execute_many) from
async fn -> Tto `fn -> impl Future<Output = T> + Send. The body forwards sqlx's underlying future directly with no.await`, so no coroutine forms at this layer; Send delegates to sqlx's own already-Send future. The HRTB on the IntoAnnotatedExecutor impls and on impl_executor! is unchanged, and the executor-side surface is unaffected.