bitflags: Be explicit in binary operators and such.

This allows having explicit + default constructor without build issues.

Author: emilio

src/bindgen/ir/structure.rs

@@ -223,7 +223,8 @@ impl Struct {
         out.open_brace();
         write!(
             out,
-            "return {{static_cast<decltype(bits)>(this->bits {} {}.bits)}};",
+            "return {} {{ static_cast<decltype(bits)>(this->bits {} {}.bits) }};",
+            self.export_name(),
             operator, other
         );
         out.close_brace(false);
@@ -553,7 +554,7 @@ impl Source for Struct {
                     self.export_name()
                 );
                 out.open_brace();
-                write!(out, "return {{static_cast<decltype(bits)>(~bits)}};");
+                write!(out, "return {} {{ static_cast<decltype(bits)>(~bits) }};", self.export_name());
                 out.close_brace(false);
                 self.emit_bitflags_binop(constexpr_prefix, '|', &other, out);
                 self.emit_bitflags_binop(constexpr_prefix, '&', &other, out);

tests/expectations/associated_in_body.cpp

@@ -14,24 +14,24 @@ struct StyleAlignFlags {
     return !!bits;
   }
   constexpr StyleAlignFlags operator~() const {
-    return {static_cast<decltype(bits)>(~bits)};
+    return StyleAlignFlags { static_cast<decltype(bits)>(~bits) };
   }
   constexpr StyleAlignFlags operator|(const StyleAlignFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits | other.bits)};
+    return StyleAlignFlags { static_cast<decltype(bits)>(this->bits | other.bits) };
   }
   StyleAlignFlags& operator|=(const StyleAlignFlags& other) {
     *this = (*this | other);
     return *this;
   }
   constexpr StyleAlignFlags operator&(const StyleAlignFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits & other.bits)};
+    return StyleAlignFlags { static_cast<decltype(bits)>(this->bits & other.bits) };
   }
   StyleAlignFlags& operator&=(const StyleAlignFlags& other) {
     *this = (*this & other);
     return *this;
   }
   constexpr StyleAlignFlags operator^(const StyleAlignFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
+    return StyleAlignFlags { static_cast<decltype(bits)>(this->bits ^ other.bits) };
   }
   StyleAlignFlags& operator^=(const StyleAlignFlags& other) {
     *this = (*this ^ other);

tests/expectations/bitflags.cpp

@@ -14,24 +14,24 @@ struct AlignFlags {
     return !!bits;
   }
   constexpr AlignFlags operator~() const {
-    return {static_cast<decltype(bits)>(~bits)};
+    return AlignFlags { static_cast<decltype(bits)>(~bits) };
   }
   constexpr AlignFlags operator|(const AlignFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits | other.bits)};
+    return AlignFlags { static_cast<decltype(bits)>(this->bits | other.bits) };
   }
   AlignFlags& operator|=(const AlignFlags& other) {
     *this = (*this | other);
     return *this;
   }
   constexpr AlignFlags operator&(const AlignFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits & other.bits)};
+    return AlignFlags { static_cast<decltype(bits)>(this->bits & other.bits) };
   }
   AlignFlags& operator&=(const AlignFlags& other) {
     *this = (*this & other);
     return *this;
   }
   constexpr AlignFlags operator^(const AlignFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
+    return AlignFlags { static_cast<decltype(bits)>(this->bits ^ other.bits) };
   }
   AlignFlags& operator^=(const AlignFlags& other) {
     *this = (*this ^ other);
@@ -59,24 +59,24 @@ struct DebugFlags {
     return !!bits;
   }
   constexpr DebugFlags operator~() const {
-    return {static_cast<decltype(bits)>(~bits)};
+    return DebugFlags { static_cast<decltype(bits)>(~bits) };
   }
   constexpr DebugFlags operator|(const DebugFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits | other.bits)};
+    return DebugFlags { static_cast<decltype(bits)>(this->bits | other.bits) };
   }
   DebugFlags& operator|=(const DebugFlags& other) {
     *this = (*this | other);
     return *this;
   }
   constexpr DebugFlags operator&(const DebugFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits & other.bits)};
+    return DebugFlags { static_cast<decltype(bits)>(this->bits & other.bits) };
   }
   DebugFlags& operator&=(const DebugFlags& other) {
     *this = (*this & other);
     return *this;
   }
   constexpr DebugFlags operator^(const DebugFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
+    return DebugFlags { static_cast<decltype(bits)>(this->bits ^ other.bits) };
   }
   DebugFlags& operator^=(const DebugFlags& other) {
     *this = (*this ^ other);
@@ -93,24 +93,24 @@ struct LargeFlags {
     return !!bits;
   }
   constexpr LargeFlags operator~() const {
-    return {static_cast<decltype(bits)>(~bits)};
+    return LargeFlags { static_cast<decltype(bits)>(~bits) };
   }
   constexpr LargeFlags operator|(const LargeFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits | other.bits)};
+    return LargeFlags { static_cast<decltype(bits)>(this->bits | other.bits) };
   }
   LargeFlags& operator|=(const LargeFlags& other) {
     *this = (*this | other);
     return *this;
   }
   constexpr LargeFlags operator&(const LargeFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits & other.bits)};
+    return LargeFlags { static_cast<decltype(bits)>(this->bits & other.bits) };
   }
   LargeFlags& operator&=(const LargeFlags& other) {
     *this = (*this & other);
     return *this;
   }
   constexpr LargeFlags operator^(const LargeFlags& other) const {
-    return {static_cast<decltype(bits)>(this->bits ^ other.bits)};
+    return LargeFlags { static_cast<decltype(bits)>(this->bits ^ other.bits) };
   }
   LargeFlags& operator^=(const LargeFlags& other) {
     *this = (*this ^ other);