diff --git a/third_party/blurmac/src/adapter.rs b/third_party/blurmac/src/adapter.rs index e51b90345a1..59f0ddfb25a 100644 --- a/third_party/blurmac/src/adapter.rs +++ b/third_party/blurmac/src/adapter.rs @@ -8,10 +8,11 @@ use std::error::Error; use std::os::raw::c_int; -use delegate::bm; -use framework::{cb, io, ns}; use objc::runtime::{Object, YES}; -use utils::{NOT_SUPPORTED_ERROR, nsx}; + +use crate::delegate::bm; +use crate::framework::{cb, io, ns}; +use crate::utils::{NOT_SUPPORTED_ERROR, nsx}; #[derive(Clone, Debug)] pub struct BluetoothAdapter { diff --git a/third_party/blurmac/src/delegate.rs b/third_party/blurmac/src/delegate.rs index 2b97e577dd8..8b59318e021 100644 --- a/third_party/blurmac/src/delegate.rs +++ b/third_party/blurmac/src/delegate.rs @@ -8,10 +8,11 @@ use std::error::Error; use std::sync::Once; -use framework::{cb, nil, ns}; use objc::declare::ClassDecl; use objc::runtime::{Class, Object, Protocol, Sel}; -use utils::{NO_PERIPHERAL_FOUND, cbx, nsx, wait}; + +use crate::framework::{cb, nil, ns}; +use crate::utils::{NO_PERIPHERAL_FOUND, cbx, nsx, wait}; pub mod bm { use super::*; diff --git a/third_party/blurmac/src/device.rs b/third_party/blurmac/src/device.rs index 04c48712b2e..9425e7627ed 100644 --- a/third_party/blurmac/src/device.rs +++ b/third_party/blurmac/src/device.rs @@ -9,11 +9,12 @@ use std::collections::HashMap; use std::error::Error; use std::sync::Arc; -use adapter::BluetoothAdapter; -use delegate::{bm, bmx}; -use framework::{cb, nil, ns}; use objc::runtime::Object; -use utils::{NO_PERIPHERAL_FOUND, NOT_SUPPORTED_ERROR, cbx, nsx, wait}; + +use crate::adapter::BluetoothAdapter; +use crate::delegate::{bm, bmx}; +use crate::framework::{cb, nil, ns}; +use crate::utils::{NO_PERIPHERAL_FOUND, NOT_SUPPORTED_ERROR, cbx, nsx, wait}; #[derive(Clone, Debug)] pub struct BluetoothDevice { diff --git a/third_party/blurmac/src/discovery_session.rs b/third_party/blurmac/src/discovery_session.rs index 89da90803f7..bbbd0f2aff2 100644 --- a/third_party/blurmac/src/discovery_session.rs +++ b/third_party/blurmac/src/discovery_session.rs @@ -8,7 +8,7 @@ use std::error::Error; use std::sync::Arc; -use adapter::BluetoothAdapter; +use crate::adapter::BluetoothAdapter; #[derive(Clone, Debug)] pub struct BluetoothDiscoverySession { diff --git a/third_party/blurmac/src/gatt_characteristic.rs b/third_party/blurmac/src/gatt_characteristic.rs index bb2d95097d7..4e582e5c6d6 100644 --- a/third_party/blurmac/src/gatt_characteristic.rs +++ b/third_party/blurmac/src/gatt_characteristic.rs @@ -10,11 +10,12 @@ use std::os::raw::c_uint; use std::slice; use std::sync::Arc; -use delegate::bmx; -use framework::{cb, nil, ns}; -use gatt_service::BluetoothGATTService; use objc::runtime::{NO, Object, YES}; -use utils::{NO_CHARACTERISTIC_FOUND, NOT_SUPPORTED_ERROR, cbx, wait}; + +use crate::delegate::bmx; +use crate::framework::{cb, nil, ns}; +use crate::gatt_service::BluetoothGATTService; +use crate::utils::{NO_CHARACTERISTIC_FOUND, NOT_SUPPORTED_ERROR, cbx, wait}; #[derive(Clone, Debug)] pub struct BluetoothGATTCharacteristic { diff --git a/third_party/blurmac/src/gatt_descriptor.rs b/third_party/blurmac/src/gatt_descriptor.rs index 2a4ce5b7eb3..0b394be2136 100644 --- a/third_party/blurmac/src/gatt_descriptor.rs +++ b/third_party/blurmac/src/gatt_descriptor.rs @@ -7,7 +7,7 @@ use std::error::Error; -use utils::NOT_SUPPORTED_ERROR; +use crate::utils::NOT_SUPPORTED_ERROR; #[derive(Clone, Debug)] pub struct BluetoothGATTDescriptor {} diff --git a/third_party/blurmac/src/gatt_service.rs b/third_party/blurmac/src/gatt_service.rs index cc46544d1e4..33de7e72450 100644 --- a/third_party/blurmac/src/gatt_service.rs +++ b/third_party/blurmac/src/gatt_service.rs @@ -8,11 +8,12 @@ use std::error::Error; use std::sync::Arc; -use delegate::bmx; -use device::BluetoothDevice; -use framework::{cb, nil, ns}; use objc::runtime::Object; -use utils::{NO_SERVICE_FOUND, cbx, wait}; + +use crate::delegate::bmx; +use crate::device::BluetoothDevice; +use crate::framework::{cb, nil, ns}; +use crate::utils::{NO_SERVICE_FOUND, cbx, wait}; #[derive(Clone, Debug)] pub struct BluetoothGATTService { diff --git a/third_party/blurmac/src/utils.rs b/third_party/blurmac/src/utils.rs index a32c002a233..0d0c2bb8985 100644 --- a/third_party/blurmac/src/utils.rs +++ b/third_party/blurmac/src/utils.rs @@ -10,9 +10,10 @@ use std::ffi::{CStr, CString}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::{thread, time}; -use framework::{cb, nil, ns}; use objc::runtime::Object; +use crate::framework::{cb, nil, ns}; + pub const NOT_SUPPORTED_ERROR: &str = "Error! Not supported by blurmac!"; pub const NO_PERIPHERAL_FOUND: &str = "Error! No peripheral found!"; pub const NO_SERVICE_FOUND: &str = "Error! No service found!";