Update deps

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bluez"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Ibiyemi Abiodun <[email protected]>"]
 edition = "2018"
 repository = "https://github.com/laptou/bluez-rs"
@@ -15,10 +15,10 @@ libc = "0.2"
 thiserror = "1.0"
 num-traits = "0.2"
 num-derive = "0.3"
-enumflags2 = "0.6.4"
-enumflags2_derive = "0.6.4"
-bytes = "0.6"
-bitvec = "0.19"
+enumflags2 = "0.7"
+enumflags2_derive = "0.7"
+bytes = "1.0"
+bitvec = "0.20"
 futures = "0.3"
 smol = "1.2"
 

src/client/advertising.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::util::BufExt2;
-use enumflags2::BitFlags;
+use enumflags2::{BitFlags, bitflags};
 
 impl<'a> BlueZClient<'a> {
     ///	This command is used to read the advertising features supported
@@ -249,7 +249,8 @@ pub struct AdvertisingParams {
 }
 
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, BitFlags)]
+#[bitflags]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum AdvertisingFlags {
     /// Indicates support for connectable advertising
     ///	and for switching to connectable advertising independent of the

src/client/params.rs

@@ -1,6 +1,6 @@
 use std::hash::Hash;
 
-use enumflags2::BitFlags;
+use enumflags2::{BitFlags, bitflags};
 
 use crate::Address;
 
@@ -54,7 +54,8 @@ pub enum LeAdvertisingMode {
 }
 
 #[repr(u8)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, BitFlags)]
+#[bitflags]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum AddressTypeFlag {
     BREDR = 1 << 0,
     LEPublic = 1 << 1,
@@ -106,7 +107,8 @@ pub struct ClockInfo {
 }
 
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, BitFlags, Eq, PartialEq)]
+#[bitflags]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum DeviceFlag {
     ConfirmName = 1 << 0,
     LegacyPairing = 1 << 1,
@@ -140,7 +142,8 @@ pub struct ConnectionParams {
 }
 
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, BitFlags)]
+#[bitflags]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum ControllerConfigOptions {
     External = 1 << 0,
     BluetoothPublicAddr = 1 << 1,
@@ -183,7 +186,8 @@ pub struct PhyConfig {
 }
 
 #[repr(u32)]
-#[derive(Debug, Copy, Clone, Eq, PartialEq, BitFlags)]
+#[bitflags]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum PhyFlag {
     BR1M1Slot = 1 << 0,
     BR1M3Slot = 1 << 1,

src/interface/class.rs

@@ -1,10 +1,11 @@
 use bitvec::{view::BitView, prelude as bv};
 use bitvec::prelude::{BitField};
 use bytes::{Buf, Bytes};
-use enumflags2::BitFlags;
+use enumflags2::{BitFlags, bitflags};
 
-#[derive(BitFlags, Copy, Clone, Debug, PartialEq)]
+#[bitflags]
 #[repr(u32)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum ServiceClass {
     Positioning = 1 << 16,
     Networking = 1 << 17,

src/interface/controller.rs

@@ -2,7 +2,7 @@ use std::ffi::CString;
 use std::fmt::{Display, Formatter};
 
 use bytes::Bytes;
-use enumflags2::BitFlags;
+use enumflags2::{BitFlags, bitflags};
 
 use crate::interface::class::{DeviceClass, ServiceClasses};
 use crate::Address;
@@ -58,7 +58,8 @@ pub struct ControllerInfoExt {
     pub eir_data: Bytes,
 }
 
-#[derive(BitFlags, Copy, Clone, Debug, PartialEq)]
+#[bitflags]
+#[derive(Copy, Clone, Debug, PartialEq)]
 #[repr(u32)]
 pub enum ControllerSetting {
     Powered = 1 << 0,

src/util.rs

@@ -3,8 +3,7 @@ use std::ffi::CString;
 use std::hash::Hash;
 
 use bytes::Buf;
-use enumflags2::BitFlags;
-use enumflags2::RawBitFlags;
+use enumflags2::{BitFlag, BitFlags};
 use num_traits::FromPrimitive;
 
 use crate::Address;
@@ -40,15 +39,15 @@ pub(crate) trait BufExt2: Buf {
         FromPrimitive::from_u16(self.get_u16_le()).unwrap()
     }
 
-    fn get_flags_u8<T: RawBitFlags<Type = u8>>(&mut self) -> BitFlags<T> {
-        BitFlags::from_bits_truncate(self.get_u8())
+    fn get_flags_u8<T: BitFlag<Numeric = u8>>(&mut self) -> BitFlags<T> {
+        BitFlags::<T, u8>::from_bits_truncate(self.get_u8())
     }
 
-    fn get_flags_u16_le<T: RawBitFlags<Type = u16>>(&mut self) -> BitFlags<T> {
+    fn get_flags_u16_le<T: BitFlag<Numeric = u16>>(&mut self) -> BitFlags<T> {
         BitFlags::from_bits_truncate(self.get_u16_le())
     }
 
-    fn get_flags_u32_le<T: RawBitFlags<Type = u32>>(&mut self) -> BitFlags<T> {
+    fn get_flags_u32_le<T: BitFlag<Numeric = u32>>(&mut self) -> BitFlags<T> {
         BitFlags::from_bits_truncate(self.get_u32_le())
     }