Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix conditional logic that enables native bluetooth (#31073)

Browse source 
PR #30974 integrated `servo/devices` repo into servo
codebase. `servo/devices` exposed the `bluetooth`
feature to conditionally compile native bluetooth
support for the target platform. In servo, this feature
is indirectly enabled via the `native-bluetooth` feature
exposed by `components/bluetooth`. When `servo/devices` was
integrated to servo, the conditional code was not updated
to use the `native-bluetooth` feature directly.

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2024-01-12 14:54:39 +05:30 • committed by GitHub
parent 6dc208bb09
commit b61c794ae4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 151 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

99
components/bluetooth/adapter.rs
View file

@ -5,17 +5,17 @@
use std::error::Error; use std::error::Error;
use std::sync::Arc; use std::sync::Arc;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_adapter::Adapter as BluetoothAdapterAndroid; use blurdroid::bluetooth_adapter::Adapter as BluetoothAdapterAndroid;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_device::Device as BluetoothDeviceAndroid; use blurdroid::bluetooth_device::Device as BluetoothDeviceAndroid;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_discovery_session::DiscoverySession as BluetoothDiscoverySessionAndroid; use blurdroid::bluetooth_discovery_session::DiscoverySession as BluetoothDiscoverySessionAndroid;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothAdapter as BluetoothAdapterMac; use blurmac::BluetoothAdapter as BluetoothAdapterMac;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothDevice as BluetoothDeviceMac; use blurmac::BluetoothDevice as BluetoothDeviceMac;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothDiscoverySession as BluetoothDiscoverySessionMac; use blurmac::BluetoothDiscoverySession as BluetoothDiscoverySessionMac;
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
use blurmock::fake_adapter::FakeBluetoothAdapter; use blurmock::fake_adapter::FakeBluetoothAdapter;
@ -23,30 +23,30 @@ use blurmock::fake_adapter::FakeBluetoothAdapter;
use blurmock::fake_device::FakeBluetoothDevice; use blurmock::fake_device::FakeBluetoothDevice;
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
use blurmock::fake_discovery_session::FakeBluetoothDiscoverySession; use blurmock::fake_discovery_session::FakeBluetoothDiscoverySession;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_adapter::BluetoothAdapter as BluetoothAdapterBluez; use blurz::bluetooth_adapter::BluetoothAdapter as BluetoothAdapterBluez;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_device::BluetoothDevice as BluetoothDeviceBluez; use blurz::bluetooth_device::BluetoothDevice as BluetoothDeviceBluez;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_discovery_session::BluetoothDiscoverySession as BluetoothDiscoverySessionBluez; use blurz::bluetooth_discovery_session::BluetoothDiscoverySession as BluetoothDiscoverySessionBluez;
use super::bluetooth::{BluetoothDevice, BluetoothDiscoverySession}; use super::bluetooth::{BluetoothDevice, BluetoothDiscoverySession};
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothDevice as BluetoothDeviceEmpty; use super::empty::BluetoothDevice as BluetoothDeviceEmpty;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothDiscoverySession as BluetoothDiscoverySessionEmpty; use super::empty::BluetoothDiscoverySession as BluetoothDiscoverySessionEmpty;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::EmptyAdapter as BluetoothAdapterEmpty; use super::empty::EmptyAdapter as BluetoothAdapterEmpty;
use super::macros::get_inner_and_call; use super::macros::get_inner_and_call;
@ -55,16 +55,16 @@ use super::macros::get_inner_and_call_test_func;
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum BluetoothAdapter { pub enum BluetoothAdapter {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
Bluez(Arc<BluetoothAdapterBluez>), Bluez(Arc<BluetoothAdapterBluez>),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
Android(Arc<BluetoothAdapterAndroid>), Android(Arc<BluetoothAdapterAndroid>),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
Mac(Arc<BluetoothAdapterMac>), Mac(Arc<BluetoothAdapterMac>),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
Empty(Arc<BluetoothAdapterEmpty>), Empty(Arc<BluetoothAdapterEmpty>),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
@ -72,28 +72,28 @@ pub enum BluetoothAdapter {
} }
impl BluetoothAdapter { impl BluetoothAdapter {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> { pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
let bluez_adapter = BluetoothAdapterBluez::init()?; let bluez_adapter = BluetoothAdapterBluez::init()?;
Ok(Self::Bluez(Arc::new(bluez_adapter))) Ok(Self::Bluez(Arc::new(bluez_adapter)))
} }
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> { pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
let blurdroid_adapter = BluetoothAdapterAndroid::get_adapter()?; let blurdroid_adapter = BluetoothAdapterAndroid::get_adapter()?;
Ok(Self::Android(Arc::new(blurdroid_adapter))) Ok(Self::Android(Arc::new(blurdroid_adapter)))
} }
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> { pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
let mac_adapter = BluetoothAdapterMac::init()?; let mac_adapter = BluetoothAdapterMac::init()?;
Ok(Self::Mac(Arc::new(mac_adapter))) Ok(Self::Mac(Arc::new(mac_adapter)))
} }
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> { pub fn new() -> Result<BluetoothAdapter, Box<dyn Error>> {
let adapter = BluetoothAdapterEmpty::init()?; let adapter = BluetoothAdapterEmpty::init()?;
@ -111,20 +111,15 @@ impl BluetoothAdapter {
pub fn get_devices(&self) -> Result<Vec<BluetoothDevice>, Box<dyn Error>> { pub fn get_devices(&self) -> Result<Vec<BluetoothDevice>, Box<dyn Error>> {
match self { match self {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
BluetoothAdapter::Bluez(inner) => { BluetoothAdapter::Bluez(inner) => {
let device_list = inner.get_device_list()?; let device_list = inner.get_device_list()?;
Ok(device_list Ok(device_list
.into_iter() .into_iter()
.map(|device| { .map(|device| BluetoothDevice::Bluez(BluetoothDeviceBluez::new(device).into()))
BluetoothDevice::Bluez(BluetoothDeviceBluez::new_empty(
self.0.clone(),
device,
))
})
.collect()) .collect())
}, },
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
BluetoothAdapter::Android(inner) => { BluetoothAdapter::Android(inner) => {
let device_list = inner.get_device_list()?; let device_list = inner.get_device_list()?;
Ok(device_list Ok(device_list
@ -137,7 +132,7 @@ impl BluetoothAdapter {
}) })
.collect()) .collect())
}, },
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
BluetoothAdapter::Mac(inner) => { BluetoothAdapter::Mac(inner) => {
let device_list = inner.get_device_list()?; let device_list = inner.get_device_list()?;
Ok(device_list Ok(device_list
@ -151,9 +146,9 @@ impl BluetoothAdapter {
.collect()) .collect())
}, },
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
BluetoothAdapter::Empty(inner) => { BluetoothAdapter::Empty(inner) => {
let device_list = inner.get_device_list()?; let device_list = inner.get_device_list()?;
@ -201,24 +196,22 @@ impl BluetoothAdapter {
pub fn create_discovery_session(&self) -> Result<BluetoothDiscoverySession, Box<dyn Error>> { pub fn create_discovery_session(&self) -> Result<BluetoothDiscoverySession, Box<dyn Error>> {
let discovery_session = match self { let discovery_session = match self {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
BluetoothAdapter::Bluez(inner) => { BluetoothAdapter::Bluez(inner) => BluetoothDiscoverySession::Bluez(Arc::new(
BluetoothDiscoverySession::Bluez(Arc::new( BluetoothDiscoverySessionBluez::create_session(inner.get_id())?,
BluetoothDiscoverySessionBluez::create_session(inner.get_id())?, )),
)); #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
},
#[cfg(all(target_os = "android", feature = "bluetooth"))]
BluetoothAdapter::Android(inner) => BluetoothDiscoverySession::Android(Arc::new( BluetoothAdapter::Android(inner) => BluetoothDiscoverySession::Android(Arc::new(
BluetoothDiscoverySessionAndroid::create_session(inner.clone())?, BluetoothDiscoverySessionAndroid::create_session(inner.clone())?,
)), )),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
BluetoothAdapter::Mac(_) => { BluetoothAdapter::Mac(_) => {
BluetoothDiscoverySession::Mac(Arc::new(BluetoothDiscoverySessionMac {})) BluetoothDiscoverySession::Mac(Arc::new(BluetoothDiscoverySessionMac {}))
}, },
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
BluetoothAdapter::Empty(_) => { BluetoothAdapter::Empty(_) => {
BluetoothDiscoverySession::Empty(Arc::new(BluetoothDiscoverySessionEmpty {})) BluetoothDiscoverySession::Empty(Arc::new(BluetoothDiscoverySessionEmpty {}))

156
components/bluetooth/bluetooth.rs
View file

@ -6,25 +6,25 @@ use std::collections::HashMap;
use std::error::Error; use std::error::Error;
use std::sync::Arc; use std::sync::Arc;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_device::Device as BluetoothDeviceAndroid; use blurdroid::bluetooth_device::Device as BluetoothDeviceAndroid;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_discovery_session::DiscoverySession as BluetoothDiscoverySessionAndroid; use blurdroid::bluetooth_discovery_session::DiscoverySession as BluetoothDiscoverySessionAndroid;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_gatt_characteristic::Characteristic as BluetoothGATTCharacteristicAndroid; use blurdroid::bluetooth_gatt_characteristic::Characteristic as BluetoothGATTCharacteristicAndroid;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_gatt_descriptor::Descriptor as BluetoothGATTDescriptorAndroid; use blurdroid::bluetooth_gatt_descriptor::Descriptor as BluetoothGATTDescriptorAndroid;
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
use blurdroid::bluetooth_gatt_service::Service as BluetoothGATTServiceAndroid; use blurdroid::bluetooth_gatt_service::Service as BluetoothGATTServiceAndroid;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothDevice as BluetoothDeviceMac; use blurmac::BluetoothDevice as BluetoothDeviceMac;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothDiscoverySession as BluetoothDiscoverySessionMac; use blurmac::BluetoothDiscoverySession as BluetoothDiscoverySessionMac;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothGATTCharacteristic as BluetoothGATTCharacteristicMac; use blurmac::BluetoothGATTCharacteristic as BluetoothGATTCharacteristicMac;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothGATTDescriptor as BluetoothGATTDescriptorMac; use blurmac::BluetoothGATTDescriptor as BluetoothGATTDescriptorMac;
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
use blurmac::BluetoothGATTService as BluetoothGATTServiceMac; use blurmac::BluetoothGATTService as BluetoothGATTServiceMac;
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
use blurmock::fake_characteristic::FakeBluetoothGATTCharacteristic; use blurmock::fake_characteristic::FakeBluetoothGATTCharacteristic;
@ -36,46 +36,46 @@ use blurmock::fake_device::FakeBluetoothDevice;
use blurmock::fake_discovery_session::FakeBluetoothDiscoverySession; use blurmock::fake_discovery_session::FakeBluetoothDiscoverySession;
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
use blurmock::fake_service::FakeBluetoothGATTService; use blurmock::fake_service::FakeBluetoothGATTService;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_device::BluetoothDevice as BluetoothDeviceBluez; use blurz::bluetooth_device::BluetoothDevice as BluetoothDeviceBluez;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_discovery_session::BluetoothDiscoverySession as BluetoothDiscoverySessionBluez; use blurz::bluetooth_discovery_session::BluetoothDiscoverySession as BluetoothDiscoverySessionBluez;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_gatt_characteristic::BluetoothGATTCharacteristic as BluetoothGATTCharacteristicBluez; use blurz::bluetooth_gatt_characteristic::BluetoothGATTCharacteristic as BluetoothGATTCharacteristicBluez;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_gatt_descriptor::BluetoothGATTDescriptor as BluetoothGATTDescriptorBluez; use blurz::bluetooth_gatt_descriptor::BluetoothGATTDescriptor as BluetoothGATTDescriptorBluez;
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
use blurz::bluetooth_gatt_service::BluetoothGATTService as BluetoothGATTServiceBluez; use blurz::bluetooth_gatt_service::BluetoothGATTService as BluetoothGATTServiceBluez;
pub use super::adapter::BluetoothAdapter; pub use super::adapter::BluetoothAdapter;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothDevice as BluetoothDeviceEmpty; use super::empty::BluetoothDevice as BluetoothDeviceEmpty;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothDiscoverySession as BluetoothDiscoverySessionEmpty; use super::empty::BluetoothDiscoverySession as BluetoothDiscoverySessionEmpty;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothGATTCharacteristic as BluetoothGATTCharacteristicEmpty; use super::empty::BluetoothGATTCharacteristic as BluetoothGATTCharacteristicEmpty;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothGATTDescriptor as BluetoothGATTDescriptorEmpty; use super::empty::BluetoothGATTDescriptor as BluetoothGATTDescriptorEmpty;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
use super::empty::BluetoothGATTService as BluetoothGATTServiceEmpty; use super::empty::BluetoothGATTService as BluetoothGATTServiceEmpty;
use super::macros::get_inner_and_call; use super::macros::get_inner_and_call;
@ -88,16 +88,16 @@ const NOT_SUPPORTED_ON_MOCK_ERROR: &'static str =
#[derive(Debug)] #[derive(Debug)]
pub enum BluetoothDiscoverySession { pub enum BluetoothDiscoverySession {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
Bluez(Arc<BluetoothDiscoverySessionBluez>), Bluez(Arc<BluetoothDiscoverySessionBluez>),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
Android(Arc<BluetoothDiscoverySessionAndroid>), Android(Arc<BluetoothDiscoverySessionAndroid>),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
Mac(Arc<BluetoothDiscoverySessionMac>), Mac(Arc<BluetoothDiscoverySessionMac>),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
Empty(Arc<BluetoothDiscoverySessionEmpty>), Empty(Arc<BluetoothDiscoverySessionEmpty>),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
@ -106,16 +106,16 @@ pub enum BluetoothDiscoverySession {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum BluetoothDevice { pub enum BluetoothDevice {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
Bluez(Arc<BluetoothDeviceBluez>), Bluez(Arc<BluetoothDeviceBluez>),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
Android(Arc<BluetoothDeviceAndroid>), Android(Arc<BluetoothDeviceAndroid>),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
Mac(Arc<BluetoothDeviceMac>), Mac(Arc<BluetoothDeviceMac>),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
Empty(Arc<BluetoothDeviceEmpty>), Empty(Arc<BluetoothDeviceEmpty>),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
@ -124,16 +124,16 @@ pub enum BluetoothDevice {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum BluetoothGATTService { pub enum BluetoothGATTService {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
Bluez(Arc<BluetoothGATTServiceBluez>), Bluez(Arc<BluetoothGATTServiceBluez>),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
Android(Arc<BluetoothGATTServiceAndroid>), Android(Arc<BluetoothGATTServiceAndroid>),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
Mac(Arc<BluetoothGATTServiceMac>), Mac(Arc<BluetoothGATTServiceMac>),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
Empty(Arc<BluetoothGATTServiceEmpty>), Empty(Arc<BluetoothGATTServiceEmpty>),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
@ -142,16 +142,16 @@ pub enum BluetoothGATTService {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum BluetoothGATTCharacteristic { pub enum BluetoothGATTCharacteristic {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
Bluez(Arc<BluetoothGATTCharacteristicBluez>), Bluez(Arc<BluetoothGATTCharacteristicBluez>),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
Android(Arc<BluetoothGATTCharacteristicAndroid>), Android(Arc<BluetoothGATTCharacteristicAndroid>),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
Mac(Arc<BluetoothGATTCharacteristicMac>), Mac(Arc<BluetoothGATTCharacteristicMac>),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
Empty(Arc<BluetoothGATTCharacteristicEmpty>), Empty(Arc<BluetoothGATTCharacteristicEmpty>),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
@ -160,16 +160,16 @@ pub enum BluetoothGATTCharacteristic {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum BluetoothGATTDescriptor { pub enum BluetoothGATTDescriptor {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
Bluez(Arc<BluetoothGATTDescriptorBluez>), Bluez(Arc<BluetoothGATTDescriptorBluez>),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
Android(Arc<BluetoothGATTDescriptorAndroid>), Android(Arc<BluetoothGATTDescriptorAndroid>),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
Mac(Arc<BluetoothGATTDescriptorMac>), Mac(Arc<BluetoothGATTDescriptorMac>),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
Empty(Arc<BluetoothGATTDescriptorEmpty>), Empty(Arc<BluetoothGATTDescriptorEmpty>),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
@ -425,22 +425,22 @@ impl BluetoothDevice {
impl BluetoothGATTService { impl BluetoothGATTService {
fn create_service(device: BluetoothDevice, service: String) -> BluetoothGATTService { fn create_service(device: BluetoothDevice, service: String) -> BluetoothGATTService {
match device { match device {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
BluetoothDevice::Bluez(_bluez_device) => { BluetoothDevice::Bluez(_bluez_device) => {
BluetoothGATTService::Bluez(Arc::new(BluetoothGATTServiceBluez::new(service))) BluetoothGATTService::Bluez(Arc::new(BluetoothGATTServiceBluez::new(service)))
}, },
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
BluetoothDevice::Android(android_device) => BluetoothGATTService::Android(Arc::new( BluetoothDevice::Android(android_device) => BluetoothGATTService::Android(Arc::new(
BluetoothGATTServiceAndroid::new(android_device, service), BluetoothGATTServiceAndroid::new(android_device, service),
)), )),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
BluetoothDevice::Mac(mac_device) => BluetoothGATTService::Mac(Arc::new( BluetoothDevice::Mac(mac_device) => BluetoothGATTService::Mac(Arc::new(
BluetoothGATTServiceMac::new(mac_device, service), BluetoothGATTServiceMac::new(mac_device, service),
)), )),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
BluetoothDevice::Empty(_device) => { BluetoothDevice::Empty(_device) => {
BluetoothGATTService::Empty(Arc::new(BluetoothGATTServiceEmpty::new(service))) BluetoothGATTService::Empty(Arc::new(BluetoothGATTServiceEmpty::new(service)))
@ -528,24 +528,24 @@ impl BluetoothGATTCharacteristic {
characteristic: String, characteristic: String,
) -> BluetoothGATTCharacteristic { ) -> BluetoothGATTCharacteristic {
match service { match service {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
BluetoothGATTService::Bluez(_bluez_service) => BluetoothGATTCharacteristic::Bluez( BluetoothGATTService::Bluez(_bluez_service) => BluetoothGATTCharacteristic::Bluez(
Arc::new(BluetoothGATTCharacteristicBluez::new(characteristic)), Arc::new(BluetoothGATTCharacteristicBluez::new(characteristic)),
), ),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
BluetoothGATTService::Android(android_service) => { BluetoothGATTService::Android(android_service) => {
BluetoothGATTCharacteristic::Android(Arc::new( BluetoothGATTCharacteristic::Android(Arc::new(
BluetoothGATTCharacteristicAndroid::new(android_service, characteristic), BluetoothGATTCharacteristicAndroid::new(android_service, characteristic),
)) ))
}, },
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
BluetoothGATTService::Mac(mac_service) => BluetoothGATTCharacteristic::Mac(Arc::new( BluetoothGATTService::Mac(mac_service) => BluetoothGATTCharacteristic::Mac(Arc::new(
BluetoothGATTCharacteristicMac::new(mac_service, characteristic), BluetoothGATTCharacteristicMac::new(mac_service, characteristic),
)), )),
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
BluetoothGATTService::Empty(_service) => BluetoothGATTCharacteristic::Empty(Arc::new( BluetoothGATTService::Empty(_service) => BluetoothGATTCharacteristic::Empty(Arc::new(
BluetoothGATTCharacteristicEmpty::new(characteristic), BluetoothGATTCharacteristicEmpty::new(characteristic),
@ -654,27 +654,27 @@ impl BluetoothGATTDescriptor {
descriptor: String, descriptor: String,
) -> BluetoothGATTDescriptor { ) -> BluetoothGATTDescriptor {
match characteristic { match characteristic {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
BluetoothGATTCharacteristic::Bluez(_bluez_characteristic) => { BluetoothGATTCharacteristic::Bluez(_bluez_characteristic) => {
BluetoothGATTDescriptor::Bluez(Arc::new(BluetoothGATTDescriptorBluez::new( BluetoothGATTDescriptor::Bluez(Arc::new(BluetoothGATTDescriptorBluez::new(
descriptor, descriptor,
))) )))
}, },
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
BluetoothGATTCharacteristic::Android(android_characteristic) => { BluetoothGATTCharacteristic::Android(android_characteristic) => {
BluetoothGATTDescriptor::Android(Arc::new(BluetoothGATTDescriptorAndroid::new( BluetoothGATTDescriptor::Android(Arc::new(BluetoothGATTDescriptorAndroid::new(
android_characteristic, android_characteristic,
descriptor, descriptor,
))) )))
}, },
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
BluetoothGATTCharacteristic::Mac(_mac_characteristic) => { BluetoothGATTCharacteristic::Mac(_mac_characteristic) => {
BluetoothGATTDescriptor::Mac(Arc::new(BluetoothGATTDescriptorMac::new(descriptor))) BluetoothGATTDescriptor::Mac(Arc::new(BluetoothGATTDescriptorMac::new(descriptor)))
}, },
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
BluetoothGATTCharacteristic::Empty(_characteristic) => BluetoothGATTDescriptor::Empty( BluetoothGATTCharacteristic::Empty(_characteristic) => BluetoothGATTDescriptor::Empty(
Arc::new(BluetoothGATTDescriptorEmpty::new(descriptor)), Arc::new(BluetoothGATTDescriptorEmpty::new(descriptor)),

6
components/bluetooth/lib.rs
View file

@ -5,9 +5,9 @@
pub mod adapter; pub mod adapter;
pub mod bluetooth; pub mod bluetooth;
#[cfg(not(any( #[cfg(not(any(
all(target_os = "linux", feature = "bluetooth"), all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth") all(target_os = "macos", feature = "native-bluetooth")
)))] )))]
mod empty; mod empty;
mod macros; mod macros;

48
components/bluetooth/macros.rs
View file

@ -5,15 +5,15 @@
macro_rules! get_inner_and_call( macro_rules! get_inner_and_call(
($enum_value: expr, $enum_type: ident, $function_name: ident) => { ($enum_value: expr, $enum_type: ident, $function_name: ident) => {
match $enum_value { match $enum_value {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
&$enum_type::Bluez(ref bluez) => bluez.$function_name(), &$enum_type::Bluez(ref bluez) => bluez.$function_name(),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
&$enum_type::Android(ref android) => android.$function_name(), &$enum_type::Android(ref android) => android.$function_name(),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
&$enum_type::Mac(ref mac) => mac.$function_name(), &$enum_type::Mac(ref mac) => mac.$function_name(),
#[cfg(not(any(all(target_os = "linux", feature = "bluetooth"), #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth"))))] all(target_os = "macos", feature = "native-bluetooth"))))]
&$enum_type::Empty(ref empty) => empty.$function_name(), &$enum_type::Empty(ref empty) => empty.$function_name(),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
&$enum_type::Mock(ref fake) => fake.$function_name(), &$enum_type::Mock(ref fake) => fake.$function_name(),
@ -22,15 +22,15 @@ macro_rules! get_inner_and_call(
(@with_bluez_offset, $enum_value: expr, $enum_type: ident, $function_name: ident) => { (@with_bluez_offset, $enum_value: expr, $enum_type: ident, $function_name: ident) => {
match $enum_value { match $enum_value {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
&$enum_type::Bluez(ref bluez) => bluez.$function_name(None), &$enum_type::Bluez(ref bluez) => bluez.$function_name(None),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
&$enum_type::Android(ref android) => android.$function_name(), &$enum_type::Android(ref android) => android.$function_name(),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
&$enum_type::Mac(ref mac) => mac.$function_name(), &$enum_type::Mac(ref mac) => mac.$function_name(),
#[cfg(not(any(all(target_os = "linux", feature = "bluetooth"), #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth"))))] all(target_os = "macos", feature = "native-bluetooth"))))]
&$enum_type::Empty(ref empty) => empty.$function_name(), &$enum_type::Empty(ref empty) => empty.$function_name(),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
&$enum_type::Mock(ref fake) => fake.$function_name(), &$enum_type::Mock(ref fake) => fake.$function_name(),
@ -39,15 +39,15 @@ macro_rules! get_inner_and_call(
($enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => { ($enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => {
match $enum_value { match $enum_value {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
&$enum_type::Bluez(ref bluez) => bluez.$function_name($value), &$enum_type::Bluez(ref bluez) => bluez.$function_name($value),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
&$enum_type::Android(ref android) => android.$function_name($value), &$enum_type::Android(ref android) => android.$function_name($value),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
&$enum_type::Mac(ref mac) => mac.$function_name($value), &$enum_type::Mac(ref mac) => mac.$function_name($value),
#[cfg(not(any(all(target_os = "linux", feature = "bluetooth"), #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth"))))] all(target_os = "macos", feature = "native-bluetooth"))))]
&$enum_type::Empty(ref empty) => empty.$function_name($value), &$enum_type::Empty(ref empty) => empty.$function_name($value),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
&$enum_type::Mock(ref fake) => fake.$function_name($value), &$enum_type::Mock(ref fake) => fake.$function_name($value),
@ -56,15 +56,15 @@ macro_rules! get_inner_and_call(
(@with_bluez_offset, $enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => { (@with_bluez_offset, $enum_value: expr, $enum_type: ident, $function_name: ident, $value: expr) => {
match $enum_value { match $enum_value {
#[cfg(all(target_os = "linux", feature = "bluetooth"))] #[cfg(all(target_os = "linux", feature = "native-bluetooth"))]
&$enum_type::Bluez(ref bluez) => bluez.$function_name($value, None), &$enum_type::Bluez(ref bluez) => bluez.$function_name($value, None),
#[cfg(all(target_os = "android", feature = "bluetooth"))] #[cfg(all(target_os = "android", feature = "native-bluetooth"))]
&$enum_type::Android(ref android) => android.$function_name($value), &$enum_type::Android(ref android) => android.$function_name($value),
#[cfg(all(target_os = "macos", feature = "bluetooth"))] #[cfg(all(target_os = "macos", feature = "native-bluetooth"))]
&$enum_type::Mac(ref mac) => mac.$function_name($value), &$enum_type::Mac(ref mac) => mac.$function_name($value),
#[cfg(not(any(all(target_os = "linux", feature = "bluetooth"), #[cfg(not(any(all(target_os = "linux", feature = "native-bluetooth"),
all(target_os = "android", feature = "bluetooth"), all(target_os = "android", feature = "native-bluetooth"),
all(target_os = "macos", feature = "bluetooth"))))] all(target_os = "macos", feature = "native-bluetooth"))))]
&$enum_type::Empty(ref empty) => empty.$function_name($value), &$enum_type::Empty(ref empty) => empty.$function_name($value),
#[cfg(feature = "bluetooth-test")] #[cfg(feature = "bluetooth-test")]
&$enum_type::Mock(ref fake) => fake.$function_name($value), &$enum_type::Mock(ref fake) => fake.$function_name($value),