async-global-executor added

Author: martin-kolarik

.github/workflows/sqlx.yml

@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        runtime: [ async-global-executor, async-std, smol, tokio ]
+        runtime: [ smol, tokio ]
         tls: [ native-tls, rustls, none ]
     steps:
       - uses: actions/checkout@v4
@@ -118,7 +118,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        runtime: [ async-global-executor, async-std, smol, tokio ]
+        runtime: [ smol, tokio ]
         linking: [ sqlite, sqlite-unbundled ]
     needs: check
     steps:
@@ -187,7 +187,7 @@ jobs:
     strategy:
       matrix:
         postgres: [ 17, 13 ]
-        runtime: [ async-global-executor, async-std, smol, tokio ]
+        runtime: [ smol, tokio ]
         tls: [ native-tls, rustls-aws-lc-rs, rustls-ring, none ]
     needs: check
     steps:
@@ -288,7 +288,7 @@ jobs:
     strategy:
       matrix:
         mysql: [ 8 ]
-        runtime: [ async-global-executor, async-std, smol, tokio ]
+        runtime: [ smol, tokio ]
         tls: [ native-tls, rustls-aws-lc-rs, rustls-ring, none ]
     needs: check
     steps:
@@ -377,7 +377,7 @@ jobs:
     strategy:
       matrix:
         mariadb: [ verylatest, 11_4, 10_11, 10_4 ]
-        runtime: [ async-global-executor, async-std, smol, tokio ]
+        runtime: [ smol, tokio ]
         tls: [ native-tls, rustls-aws-lc-rs, rustls-ring, none ]
     needs: check
     steps:

sqlx-core/src/rt/mod.rs

@@ -158,24 +158,17 @@ pub async fn yield_now() {
 
 #[track_caller]
 pub fn test_block_on<F: Future>(f: F) -> F::Output {
-    #[cfg(feature = "_rt-tokio")]
-    {
-        if rt_tokio::available() {
-            return tokio::runtime::Builder::new_current_thread()
-                .enable_all()
-                .build()
-                .expect("failed to start Tokio runtime")
-                .block_on(f);
-        }
-    }
-
     cfg_if! {
-        if #[cfg(feature = "_rt-async-global-executor")] {
-            async_io_global_executor::block_on(f)
-        } else if #[cfg(feature = "_rt-async-std")] {
+        if #[cfg(feature = "_rt-async-std")] {
             async_std::task::block_on(f)
         } else if #[cfg(feature = "_rt-smol")] {
             smol::block_on(f)
+        } else if #[cfg(feature = "_rt-tokio")] {
+            tokio::runtime::Builder::new_current_thread()
+                .enable_all()
+                .build()
+                .expect("failed to start Tokio runtime")
+                .block_on(f)
         } else {
             missing_rt(f)
         }