Merge pull request #268 from konsumlamm/fix-debug

Fix bug in `Debug` implementation

src/lib.rs

@@ -494,8 +494,7 @@ macro_rules! __impl_bitflags {
                         f.write_str(" | ")?;
                     }
                     first = false;
-                    f.write_str("0x")?;
-                    $crate::_core::fmt::LowerHex::fmt(&extra_bits, f)?;
+                    $crate::_core::write!(f, "{:#x}", extra_bits)?;
                 }
                 if first {
                     f.write_str("(empty)")?;

tests/compile-fail/trait/custom_impl.rs

@@ -62,4 +62,4 @@ impl BitFlags for BootlegFlags {
     }
 }
 
-fn main() { }
+fn main() {}

tests/compile-pass/impls/convert.rs

@@ -12,6 +12,4 @@ impl From<u32> for Flags {
     }
 }
 
-fn main() {
-
-}
+fn main() {}

tests/compile-pass/impls/fmt.rs

@@ -0,0 +1,14 @@
+use bitflags::bitflags;
+
+bitflags! {
+    struct Flags: u8 {
+        const TWO = 0x2;
+    }
+}
+
+fn main() {
+    // bug #267 (https://github.com/bitflags/bitflags/issues/267)
+    let flags = unsafe { Flags::from_bits_unchecked(0b11) };
+    assert_eq!(format!("{:?}", flags), "TWO | 0x1");
+    assert_eq!(format!("{:#?}", flags), "TWO | 0x1");
+}

tests/compile-pass/redefinition/stringify.rs → tests/compile-pass/redefinition/macros.rs

@@ -7,13 +7,18 @@ macro_rules! stringify {
     ($($t:tt)*) => { "..." };
 }
 
+#[allow(unused_macros)]
+macro_rules! write {
+    ($($t:tt)*) => { "..." };
+}
+
 bitflags! {
     struct Test: u8 {
         const A = 1;
     }
 }
 
 fn main() {
-    // Just make sure we don't call the redefined `stringify` macro
-    assert_eq!(format!("{:?}", Test::A), "A");
+    // Just make sure we don't call the redefined `stringify` or `write` macro
+    assert_eq!(format!("{:?}", unsafe { Test::from_bits_unchecked(0b11) }), "A | 0x2");
 }