chore: Test async_fn_in_trait in new feature nightly-tests

audunhalland · Dec 9, 2022 · 2b3661b · 2b3661b
1 parent f236d5a
commit 2b3661b
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 11 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: taiki-e/install-action@cargo-hack
       - name: Test feature powerset
-        run: cargo hack --feature-powerset --optional-deps "unimock" --exclude-features "default use-associated-futures" --exclude-no-default-features test
+        run: cargo hack --feature-powerset --exclude-features "default use-associated-futures nightly-tests" --exclude-no-default-features test
       - name: Test workspace
         run: cargo test --workspace --features "boxed-futures"
       - name: Doctest
@@ -31,4 +31,4 @@ jobs:
       - uses: dtolnay/rust-toolchain@nightly
       - uses: taiki-e/install-action@cargo-hack
       - name: Test nightly features
-        run: cargo hack --feature-powerset --optional-deps "unimock" --exclude-features "default boxed-futures use-boxed-futures" --exclude-no-default-features test
+        run: cargo hack --feature-powerset --exclude-features "default boxed-futures use-boxed-futures" --exclude-no-default-features test
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,6 +15,7 @@ unimock = ["dep:unimock"]
 use-boxed-futures = ["boxed-futures"]
 use-associated-futures = []
 boxed-futures = ["dep:async-trait"]
+nightly-tests = []
 
 [dependencies]
 entrait_macros = { path = "entrait_macros", version = "0.5.0-alpha.1" }

diff --git a/test_all_stable.sh b/test_all_stable.sh
@@ -2,6 +2,6 @@
 set -e
 set -x
 
-cargo hack --feature-powerset --optional-deps "unimock" --exclude-features "default use-associated-futures" --exclude-no-default-features test
+cargo hack --feature-powerset --exclude-features "default use-associated-futures nightly-tests" --exclude-no-default-features test
 cargo test --workspace --features "unimock use-boxed-futures"
 cargo test --doc --features "unimock use-boxed-futures"
diff --git a/tests/it/dependency_inversion.rs b/tests/it/dependency_inversion.rs
@@ -92,7 +92,7 @@ mod simple_dyn {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(feature = "nightly-tests")]
 mod async_static {
     use entrait::*;
 

diff --git a/tests/it/main.rs b/tests/it/main.rs
@@ -1,7 +1,18 @@
 #![allow(dead_code)]
 #![allow(unused)]
 #![allow(clippy::blacklisted_name)]
-#![cfg_attr(feature = "use-associated-futures", feature(type_alias_impl_trait))]
+#![cfg_attr(
+    any(feature = "nightly-tests", feature = "use-associated-futures"),
+    feature(type_alias_impl_trait)
+)]
+#![cfg_attr(
+    any(feature = "nightly-tests", feature = "use-associated-futures"),
+    feature(async_fn_in_trait)
+)]
+#![cfg_attr(
+    any(feature = "nightly-tests", feature = "use-associated-futures"),
+    feature(closure_track_caller)
+)]
 
 mod delegation_modes;
 mod dependency_inversion;

diff --git a/tests/it/simple.rs b/tests/it/simple.rs
@@ -82,7 +82,11 @@ mod bounds {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(any(
+    feature = "use-boxed-futures",
+    feature = "use-associated-futures",
+    feature = "nightly-tests"
+))]
 mod no_deps_and_feign {
     use entrait::entrait;
 

diff --git a/tests/it/unimock.rs b/tests/it/unimock.rs
@@ -15,7 +15,11 @@ mod sync {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(any(
+    feature = "use-boxed-futures",
+    feature = "use-associated-futures",
+    feature = "nightly-tests"
+))]
 mod auth {
     use entrait::*;
     use unimock::*;
@@ -117,7 +121,11 @@ mod auth {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(any(
+    feature = "use-boxed-futures",
+    feature = "use-associated-futures",
+    feature = "nightly-tests"
+))]
 mod multi_mock {
     use entrait::*;
     use unimock::*;
@@ -200,6 +208,9 @@ mod multi_mock {
     }
 }
 
+/// Note: This test does not run under "nightly-tests",
+/// because it uses tokio::spawn, and there is currently
+/// no way to Send-bound futures from plain async fns in traits.
 #[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
 mod tokio_spawn {
     use entrait::*;
@@ -249,7 +260,11 @@ mod tokio_spawn {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(any(
+    feature = "use-boxed-futures",
+    feature = "use-associated-futures",
+    feature = "nightly-tests"
+))]
 mod more_async {
     use entrait::*;
     use unimock::*;
@@ -290,7 +305,11 @@ mod more_async {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(any(
+    feature = "use-boxed-futures",
+    feature = "use-associated-futures",
+    feature = "nightly-tests"
+))]
 mod async_no_deps_etc {
     use entrait::*;
     use unimock::*;
@@ -521,7 +540,11 @@ mod module {
     }
 }
 
-#[cfg(any(feature = "use-boxed-futures", feature = "use-associated-futures"))]
+#[cfg(any(
+    feature = "use-boxed-futures",
+    feature = "use-associated-futures",
+    feature = "nightly-tests"
+))]
 mod module_async {
     use entrait::*;