From 8c67a430416c74470ff33fa408264094ed4ec43e Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Wed, 4 May 2022 10:47:27 +1000 Subject: [PATCH] fix emission of some expected warnings --- src/lib.rs | 15 ++++++++------- tests/compile-pass/deprecated.rs | 14 ++++++++++++++ tests/compile-pass/non_snake_case.rs | 13 +++++++++++++ 3 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 tests/compile-pass/deprecated.rs create mode 100644 tests/compile-pass/non_snake_case.rs diff --git a/src/lib.rs b/src/lib.rs index f2546a5b..979ff918 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -456,7 +456,14 @@ macro_rules! __impl_bitflags { } } - #[allow(dead_code)] + #[allow( + dead_code, + deprecated, + unused_doc_comments, + unused_attributes, + unused_mut, + non_upper_case_globals + )] impl $BitFlags { $( $(#[$attr $($args)*])* @@ -502,11 +509,9 @@ macro_rules! __impl_bitflags { return Self { bits } } - #[allow(unused_mut)] let mut truncated = <$T as $crate::__private::Bits>::EMPTY; $( - #[allow(unused_doc_comments, unused_attributes)] $(#[$attr $($args)*])* if bits & Self::$Flag.bits == Self::$Flag.bits { truncated |= Self::$Flag.bits @@ -678,11 +683,9 @@ macro_rules! __impl_bitflags { use $crate::__private::core::iter::Iterator as _; const NUM_FLAGS: usize = { - #[allow(unused_mut)] let mut num_flags = 0; $( - #[allow(unused_doc_comments, unused_attributes)] $(#[$attr $($args)*])* { num_flags += 1; @@ -694,13 +697,11 @@ macro_rules! __impl_bitflags { const OPTIONS: [$BitFlags; NUM_FLAGS] = [ $( - #[allow(unused_doc_comments, unused_attributes)] $(#[$attr $($args)*])* $BitFlags::$Flag, )* ]; - #[allow(unused_doc_comments, unused_attributes)] const OPTIONS_NAMES: [&'static str; NUM_FLAGS] = [ $( $(#[$attr $($args)*])* diff --git a/tests/compile-pass/deprecated.rs b/tests/compile-pass/deprecated.rs new file mode 100644 index 00000000..167ce44c --- /dev/null +++ b/tests/compile-pass/deprecated.rs @@ -0,0 +1,14 @@ +#![deny(warnings)] + +#[macro_use] +extern crate bitflags; + +bitflags! { + pub struct Flags: u32 { + #[deprecated = "Use something else"] + const A = 0b00000001; + const B = 0b00000010; + } +} + +fn main() {} diff --git a/tests/compile-pass/non_snake_case.rs b/tests/compile-pass/non_snake_case.rs new file mode 100644 index 00000000..5a3b8103 --- /dev/null +++ b/tests/compile-pass/non_snake_case.rs @@ -0,0 +1,13 @@ +#![deny(warnings)] + +#[macro_use] +extern crate bitflags; + +bitflags! { + pub struct Flags: u32 { + const CamelCase = 0b00000001; + const B = 0b00000010; + } +} + +fn main() {}