Skip to content

Commit a7dc937

Browse files
authored
Merge pull request #205 from matze/drop-async-trait
Drop async-trait
2 parents 8fde731 + ed263a6 commit a7dc937

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

Cargo.lock

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

bluez-async/Cargo.toml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
[package]
22
name = "bluez-async"
33
version = "0.7.2"
4-
authors = ["Andrew Walbran <[email protected]>", "David Laban <[email protected]>"]
4+
authors = [
5+
"Andrew Walbran <[email protected]>",
6+
"David Laban <[email protected]>",
7+
]
58
edition = "2018"
69
license = "MIT OR Apache-2.0"
710
description = "An async wrapper around the D-Bus interface of BlueZ (the Linux Bluetooth daemon), supporting GATT client (central) functionality."
@@ -10,7 +13,6 @@ keywords = ["ble", "bluetooth", "bluez"]
1013
categories = ["api-bindings", "hardware-support", "os::linux-apis"]
1114

1215
[dependencies]
13-
async-trait = "0.1.82"
1416
bitflags = "2.6.0"
1517
bluez-generated = { version = "0.3.0", path = "../bluez-generated" }
1618
dbus = { version = "0.9.7", features = ["futures"] }
@@ -27,4 +29,9 @@ uuid = "1.10.0"
2729
[dev-dependencies]
2830
eyre = "0.6.12"
2931
pretty_env_logger = "0.5.0"
30-
tokio = { version = "1.38.1", features = ["macros", "rt", "rt-multi-thread", "time"] }
32+
tokio = { version = "1.38.1", features = [
33+
"macros",
34+
"rt",
35+
"rt-multi-thread",
36+
"time",
37+
] }

bluez-async/src/introspect.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use async_trait::async_trait;
21
use dbus::nonblock::stdintf::org_freedesktop_dbus::Introspectable;
32
use serde::Deserialize;
43

@@ -109,12 +108,10 @@ pub enum Access {
109108
}
110109

111110
/// Extension trait to introspect D-Bus objects and parse the resulting XML into a typed structure.
112-
#[async_trait]
113111
pub trait IntrospectParse {
114112
async fn introspect_parse(&self) -> Result<Node, BluetoothError>;
115113
}
116114

117-
#[async_trait]
118115
impl<T: Introspectable + Sync> IntrospectParse for T {
119116
/// Introspect this object, and parse the resulting XML into a typed structure.
120117
async fn introspect_parse(&self) -> Result<Node, BluetoothError> {

0 commit comments

Comments
 (0)