Merge 'upstream/master' into 'alice/unexpected-cfgs'

Darksonn · May 5, 2024 · 07eb00c · 07eb00c
2 parents f0659d6 + b652a4e
commit 07eb00c
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 71 deletions.
diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml
@@ -29,7 +29,7 @@ codec = []
 time = ["tokio/time","slab"]
 io = []
 io-util = ["io", "tokio/rt", "tokio/io-util"]
-rt = ["tokio/rt", "tokio/sync", "futures-util", "hashbrown", "ahash"]
+rt = ["tokio/rt", "tokio/sync", "futures-util", "hashbrown"]
 
 __docs_rs = ["futures-util"]
 
@@ -45,8 +45,7 @@ slab = { version = "0.4.4", optional = true } # Backs `DelayQueue`
 tracing = { version = "0.1.25", default-features = false, features = ["std"], optional = true }
 
 [target.'cfg(tokio_unstable)'.dependencies]
-hashbrown = { version = "0.14.0", optional = true }
-ahash = { version = "0.8.7", optional = true }
+hashbrown = { version = "0.14.0", default-features = false, optional = true }
 
 [dev-dependencies]
 tokio = { version = "1.0.0", path = "../tokio", features = ["full"] }

diff --git a/tokio/tests/task_builder.rs b/tokio/tests/task_builder.rs
@@ -1,83 +1,81 @@
 #![allow(unknown_lints, unexpected_cfgs)]
+#![cfg(all(tokio_unstable, feature = "tracing"))]
 
-#[cfg(all(tokio_unstable, feature = "tracing"))]
-mod tests {
-    use std::rc::Rc;
-    use tokio::{
-        task::{Builder, LocalSet},
-        test,
-    };
+use std::rc::Rc;
+use tokio::{
+    task::{Builder, LocalSet},
+    test,
+};
 
-    #[test]
-    async fn spawn_with_name() {
-        let result = Builder::new()
-            .name("name")
-            .spawn(async { "task executed" })
-            .unwrap()
-            .await;
+#[test]
+async fn spawn_with_name() {
+    let result = Builder::new()
+        .name("name")
+        .spawn(async { "task executed" })
+        .unwrap()
+        .await;
 
-        assert_eq!(result.unwrap(), "task executed");
-    }
+    assert_eq!(result.unwrap(), "task executed");
+}
 
-    #[test]
-    async fn spawn_blocking_with_name() {
-        let result = Builder::new()
-            .name("name")
-            .spawn_blocking(|| "task executed")
-            .unwrap()
-            .await;
+#[test]
+async fn spawn_blocking_with_name() {
+    let result = Builder::new()
+        .name("name")
+        .spawn_blocking(|| "task executed")
+        .unwrap()
+        .await;
 
-        assert_eq!(result.unwrap(), "task executed");
-    }
+    assert_eq!(result.unwrap(), "task executed");
+}
 
-    #[test]
-    async fn spawn_local_with_name() {
-        let unsend_data = Rc::new("task executed");
-        let result = LocalSet::new()
-            .run_until(async move {
-                Builder::new()
-                    .name("name")
-                    .spawn_local(async move { unsend_data })
-                    .unwrap()
-                    .await
-            })
-            .await;
+#[test]
+async fn spawn_local_with_name() {
+    let unsend_data = Rc::new("task executed");
+    let result = LocalSet::new()
+        .run_until(async move {
+            Builder::new()
+                .name("name")
+                .spawn_local(async move { unsend_data })
+                .unwrap()
+                .await
+        })
+        .await;
 
-        assert_eq!(*result.unwrap(), "task executed");
-    }
+    assert_eq!(*result.unwrap(), "task executed");
+}
 
-    #[test]
-    async fn spawn_without_name() {
-        let result = Builder::new()
-            .spawn(async { "task executed" })
-            .unwrap()
-            .await;
+#[test]
+async fn spawn_without_name() {
+    let result = Builder::new()
+        .spawn(async { "task executed" })
+        .unwrap()
+        .await;
 
-        assert_eq!(result.unwrap(), "task executed");
-    }
+    assert_eq!(result.unwrap(), "task executed");
+}
 
-    #[test]
-    async fn spawn_blocking_without_name() {
-        let result = Builder::new()
-            .spawn_blocking(|| "task executed")
-            .unwrap()
-            .await;
+#[test]
+async fn spawn_blocking_without_name() {
+    let result = Builder::new()
+        .spawn_blocking(|| "task executed")
+        .unwrap()
+        .await;
 
-        assert_eq!(result.unwrap(), "task executed");
-    }
+    assert_eq!(result.unwrap(), "task executed");
+}
 
-    #[test]
-    async fn spawn_local_without_name() {
-        let unsend_data = Rc::new("task executed");
-        let result = LocalSet::new()
-            .run_until(async move {
-                Builder::new()
-                    .spawn_local(async move { unsend_data })
-                    .unwrap()
-                    .await
-            })
-            .await;
+#[test]
+async fn spawn_local_without_name() {
+    let unsend_data = Rc::new("task executed");
+    let result = LocalSet::new()
+        .run_until(async move {
+            Builder::new()
+                .spawn_local(async move { unsend_data })
+                .unwrap()
+                .await
+        })
+        .await;
 
-        assert_eq!(*result.unwrap(), "task executed");
-    }
+    assert_eq!(*result.unwrap(), "task executed");
 }