Skip to content

Commit 9dfad97

Browse files
authored
fix: Don't enable the zbus/tokio feature on Unix (#521)
1 parent 6450470 commit 9dfad97

File tree

3 files changed

+5
-22
lines changed

3 files changed

+5
-22
lines changed

Cargo.lock

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platforms/unix/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ rust-version.workspace = true
1313

1414
[features]
1515
default = ["async-io"]
16-
async-io = ["dep:async-channel", "dep:async-executor", "dep:async-task", "dep:futures-util", "atspi/async-std", "zbus/async-io"]
17-
tokio = ["dep:tokio", "dep:tokio-stream", "atspi/tokio", "zbus/tokio"]
16+
async-io = ["dep:async-channel", "dep:async-executor", "dep:async-task", "dep:futures-util"]
17+
tokio = ["dep:tokio", "dep:tokio-stream"]
1818

1919
[dependencies]
2020
accesskit = { version = "0.17.1", path = "../../common" }
2121
accesskit_atspi_common = { version = "0.10.1", path = "../atspi-common" }
22-
atspi = { version = "0.25", default-features = false }
22+
atspi = { version = "0.25", default-features = false, features = ["async-std"] }
2323
futures-lite = "2.3"
2424
serde = "1.0"
25-
zbus = { version = "5.5", default-features = false }
25+
zbus = { version = "5.5", default-features = false, features = ["async-io"] }
2626

2727
# async-io support
2828
async-channel = { version = "2.1.1", optional = true }

platforms/unix/src/executor.rs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,7 @@ impl Executor<'_> {
5555

5656
#[cfg(feature = "tokio")]
5757
{
58-
#[cfg(tokio_unstable)]
59-
{
60-
Task(Some(
61-
tokio::task::Builder::new()
62-
.name(name)
63-
.spawn(future)
64-
// SAFETY: Looking at the code, this call always returns an `Ok`.
65-
.unwrap(),
66-
))
67-
}
68-
#[cfg(not(tokio_unstable))]
69-
{
70-
Task(Some(tokio::task::spawn(future)))
71-
}
58+
Task(Some(tokio::task::spawn(future)))
7259
}
7360
}
7461

0 commit comments

Comments
 (0)