Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87b86e23 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang
Browse files

floss: Uprev bitflags package to 2.4.0 

The old bitflags version causes "error: &-masking with zero" error when
running clippy.

Bug: 343315863
Tag: #floss
Test: mmm packages/modules/Bluetooth
Test: ./build.py --target clippy, topshim passed
Test: ./build.py --target test
Test: Deploy to Guybrush, tested PhoneHub/SmartLock/FastPair/NearbyShare
Test: AVL test together with https://r.android.com/3119556
Flag: EXEMPT, Floss-only changes
Change-Id: I63f5cb3e11208fc609dcce0d4df015e58efc7f2a
parent bcd7b636

system/gd/rust/linux/client/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 


clap = "2.33.3"

chrono = "0.4.24"

bitflags = "1.2"

bitflags = "2.4.0"

hex = "0.4.3"

[build-dependencies]

pkg-config = "0.3.19"

system/gd/rust/topshim/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ num-traits = "0.2" 
proc-macro2 = "1.0"

tokio = { version = "1", features = ['bytes', 'fs', 'io-util', 'libc', 'macros', 'mio', 'net', 'num_cpus', 'rt', 'rt-multi-thread', 'sync', 'time', 'tokio-macros'] }

tokio-stream = "0.1"

bitflags ="1.2"

bitflags ="2.4.0"



[build-dependencies]

bindgen = "0.64"

system/gd/rust/topshim/src/profiles/a2dp.rs

+3 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ pub struct A2dpError { 
}



bitflags! {

    #[derive(Clone, Copy, Debug, PartialEq)]

    pub struct A2dpCodecSampleRate: i32 {

        const RATE_NONE = 0x0;

        const RATE_44100 = 0x01;
@@ -129,6 +130,7 @@ impl TryFrom<i32> for A2dpCodecSampleRate { 
}



bitflags! {

    #[derive(Clone, Copy, Debug, PartialEq)]

    pub struct A2dpCodecBitsPerSample: i32 {

        const SAMPLE_NONE = 0x0;

        const SAMPLE_16 = 0x01;
@@ -158,6 +160,7 @@ impl TryFrom<i32> for A2dpCodecBitsPerSample { 
}



bitflags! {

    #[derive(Clone, Copy, Debug, PartialEq)]

    pub struct A2dpCodecChannelMode: i32 {

        const MODE_NONE = 0x0;

        const MODE_MONO = 0x01;

system/gd/rust/topshim/src/profiles/hfp.rs

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ impl From<u32> for BthfAudioState { 
// This is used for codec-negotiation related methods that do not

// concern with the coding format. Do not confuse this with |HfpCodecFormat|.

bitflags! {

    #[derive(Default)]

    #[derive(Clone, Debug, Default)]

    pub struct HfpCodecBitId: i32 {

        const NONE = 0b000;

        const CVSD = 0b001;
@@ -110,7 +110,7 @@ impl TryFrom<i32> for HfpCodecBitId { 
}



bitflags! {

    #[derive(Default)]

    #[derive(Clone, Copy, Debug, Default, PartialEq)]

    pub struct HfpCodecFormat: i32 {

        const NONE =             0b0000;

        const CVSD =             0b0001;