fix errors

Author: isabelatkinson

src/change_stream/mod.rs

@@ -45,7 +45,7 @@ use crate::{
 /// A `ChangeStream` can be iterated like any other [`Stream`]:
 ///
 /// ```
-/// # #[cfg(all(not(feature = "sync"), not(feature = "tokio-sync"))]
+/// # #[cfg(all(not(feature = "sync"), not(feature = "tokio-sync")))]
 /// # use futures::stream::StreamExt;
 /// # use mongodb::{Client, error::Result, bson::doc,
 /// # change_stream::event::ChangeStreamEvent};

src/client/mod.rs

@@ -59,7 +59,7 @@ const DEFAULT_SERVER_SELECTION_TIMEOUT: Duration = Duration::from_secs(30);
 /// # #[cfg(feature = "tokio-runtime")]
 /// # use tokio::task;
 /// #
-/// # #[cfg(all(not(feature = "sync"), not(feature = "tokio-sync"))]
+/// # #[cfg(all(not(feature = "sync"), not(feature = "tokio-sync")))]
 /// # async fn start_workers() -> Result<()> {
 /// let client = Client::with_uri_str("mongodb://example.com").await?;
 ///

src/db/mod.rs

@@ -46,7 +46,7 @@ use crate::{
 ///
 /// ```rust
 /// 
-/// # #[cfg(all(not(feature = "sync"), not(feature = "tokio-sync"))]
+/// # #[cfg(all(not(feature = "sync"), not(feature = "tokio-sync")))]
 /// # use mongodb::{bson::Document, Client, error::Result};
 /// # #[cfg(feature = "async-std-runtime")]
 /// # use async_std::task;

src/lib.rs

@@ -357,7 +357,6 @@ pub(crate) use crate::{
 
 pub use {coll::Namespace, index::IndexModel, client::session::ClusterTime, sdam::public::*};
 
-// isabeltodo
 #[cfg(all(
     feature = "tokio-runtime",
     feature = "async-std-runtime",

src/runtime/mod.rs

@@ -36,12 +36,18 @@ where
     F: Future<Output = O> + Send + 'static,
     O: Send + 'static,
 {
-    #[cfg(feature = "tokio-runtime")]
+    #[cfg(all(feature = "tokio-runtime", not(feature = "tokio-sync")))]
     {
         let handle = tokio::runtime::Handle::current();
         AsyncJoinHandle::Tokio(handle.spawn(fut))
     }
 
+    #[cfg(feature = "tokio-sync")]
+    {
+        let handle = crate::sync::TOKIO_RUNTIME.handle();
+        AsyncJoinHandle::Tokio(handle.spawn(fut))
+    }
+
     #[cfg(feature = "async-std-runtime")]
     {
         AsyncJoinHandle::AsyncStd(async_std::task::spawn(fut))
@@ -59,19 +65,19 @@ where
     spawn(fut);
 }
 
-#[cfg(test)]
+#[cfg(any(test, feature = "sync", feature = "tokio-sync"))]
 pub(crate) fn block_on<F, T>(fut: F) -> T
 where
     F: Future<Output = T>,
 {
-    #[cfg(feature = "tokio-sync")]
+    #[cfg(all(feature = "tokio-runtime", not(feature = "tokio-sync")))]
     {
-        crate::sync::TOKIO_RUNTIME.block_on(fut)
+        tokio::task::block_in_place(|| futures::executor::block_on(fut))
     }
 
-    #[cfg(all(feature = "tokio-runtime", not(feature = "tokio-sync")))]
+    #[cfg(feature = "tokio-sync")]
     {
-        tokio::task::block_in_place(|| futures::executor::block_on(fut))
+        crate::sync::TOKIO_RUNTIME.block_on(fut)
     }
 
     #[cfg(feature = "async-std-runtime")]

src/sync/test.rs

@@ -276,8 +276,11 @@ fn collection_generic_bounds() {
     #[derive(Deserialize)]
     struct Foo;
 
+    println!("1");
     let options = CLIENT_OPTIONS.clone();
+    println!("2");
     let client = Client::with_options(options).expect("client creation should succeed");
+    println!("3");
 
     // ensure this code successfully compiles
     let coll: Collection<Foo> = client