Skip to content

Commit

Permalink
Update tokio / dbus to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
benjumanji authored and dfrankland committed Nov 18, 2021
1 parent 1065a1a commit f3d5f6f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ keywords = ["BLE", "Bluetooth", "Bluez", "CoreBluetooth", "USB"]
categories = ["os", "api-bindings", "hardware-support"]
[dependencies]
futures = "0.3"
tokio = "0.2"
tokio = { version = "1.0", features = ["macros", "rt"] }
uuid = "0.8.1"
log = "0.4"
[target."cfg(any(target_os = \"linux\", target_os = \"android\"))".dependencies]
dbus = "^0.8.4"
dbus-tokio = "^0.5.2"
dbus-crossroads = "^0.2.1"
dbus = "^0.9.0"
dbus-tokio = "^0.7.0"
dbus-tree = "^0.9.1"
dbus-crossroads = "^0.3.0"
[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies]
objc = "0.2.7"
objc-foundation = "0.1.1"
Expand Down
2 changes: 1 addition & 1 deletion src/peripheral/bluez/gatt/characteristic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use dbus::{
arg::{RefArg, Variant},
channel::Sender,
nonblock::stdintf::org_freedesktop_dbus::PropertiesPropertiesChanged,
tree::MethodErr,
Message, Path,
};
use dbus_tree::MethodErr;
use futures::{
channel::{mpsc, oneshot},
prelude::*,
Expand Down
2 changes: 1 addition & 1 deletion tests/peripheral.rs
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ async fn it_advertises_gatt() {
.unwrap();
println!("Peripheral started advertising");
let ad_check = async { while !peripheral.is_advertising().await.unwrap() {} };
let timeout = tokio::time::delay_for(ADVERTISING_TIMEOUT);
let timeout = tokio::time::sleep(ADVERTISING_TIMEOUT);
futures::join!(ad_check, timeout);
peripheral.stop_advertising().await.unwrap();
while peripheral.is_advertising().await.unwrap() {}
Expand Down

0 comments on commit f3d5f6f

Please sign in to comment.