Bump bitflags to v2 (#2358)

Cargo.toml

@@ -28,9 +28,9 @@ dot-out = []
 glsl-in = ["pp-rs"]
 glsl-out = []
 msl-out = []
-serialize = ["serde", "indexmap/serde-1"]
-deserialize = ["serde", "indexmap/serde-1"]
-arbitrary = ["dep:arbitrary", "indexmap/arbitrary"]
+serialize = ["serde", "bitflags/serde", "indexmap/serde-1"]
+deserialize = ["serde", "bitflags/serde", "indexmap/serde-1"]
+arbitrary = ["dep:arbitrary", "bitflags/arbitrary", "indexmap/arbitrary"]
 spv-in = ["petgraph", "spirv"]
 spv-out = ["spirv"]
 wgsl-in = ["codespan-reporting", "hexf-parse", "termcolor", "unicode-xid"]
@@ -45,7 +45,7 @@ harness = false
 
 [dependencies]
 arbitrary = { version = "1.0.2", features = ["derive"], optional = true }
-bitflags = "1.0.5"
+bitflags = "2"
 bit-set = "0.5"
 termcolor = { version = "1.0.4", optional = true }
 # remove termcolor dep when updating to the next version of codespan-reporting

src/back/glsl/features.rs

@@ -7,6 +7,7 @@ use std::fmt::Write;
 
 bitflags::bitflags! {
     /// Structure used to encode additions to GLSL that aren't supported by all versions.
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct Features: u32 {
         /// Buffer address space support.
         const BUFFER_STORAGE = 1;

src/back/glsl/mod.rs

@@ -216,6 +216,7 @@ bitflags::bitflags! {
     /// Configuration flags for the [`Writer`].
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct WriterFlags: u32 {
         /// Flip output Y and extend Z from (0, 1) to (-1, 1).
         const ADJUST_COORDINATE_SPACE = 0x1;

src/back/mod.rs

@@ -228,7 +228,7 @@ bitflags::bitflags! {
     /// we might as well make one back end's life easier.)
     ///
     /// [`RayDesc`]: crate::Module::generate_ray_desc_type
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
     pub struct RayFlag: u32 {
         const OPAQUE = 0x01;
         const NO_OPAQUE = 0x02;

src/back/spv/mod.rs

@@ -176,6 +176,7 @@ struct LocalImageType {
 
 bitflags::bitflags! {
     /// Flags corresponding to the boolean(-ish) parameters to OpTypeImage.
+    #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
     pub struct ImageTypeFlags: u8 {
         const DEPTH = 0x1;
         const ARRAYED = 0x2;
@@ -624,6 +625,7 @@ pub struct Writer {
 }
 
 bitflags::bitflags! {
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct WriterFlags: u32 {
         /// Include debug labels for everything.
         const DEBUG = 0x1;

src/back/wgsl/writer.rs

@@ -53,6 +53,7 @@ enum Indirection {
 bitflags::bitflags! {
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct WriterFlags: u32 {
         /// Always annotate the type information instead of inferring.
         const EXPLICIT_TYPES = 0x1;

src/front/glsl/ast.rs

@@ -67,6 +67,7 @@ bitflags::bitflags! {
     /// builtins overloads can't be generated unless explicitly used, since they might cause
     /// unneeded capabilities to be requested
     #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct BuiltinVariations: u32 {
         /// Request the standard overloads
         const STANDARD = 1 << 0;

src/front/spv/image.rs

@@ -10,6 +10,7 @@ pub(super) struct LookupSampledImage {
 
 bitflags::bitflags! {
     /// Flags describing sampling method.
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct SamplingFlags: u32 {
         /// Regular sampling.
         const REGULAR = 0x1;

src/front/spv/mod.rs

@@ -168,7 +168,7 @@ impl crate::ImageDimension {
 type MemberIndex = u32;
 
 bitflags::bitflags! {
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default)]
     struct DecorationFlags: u32 {
         const NON_READABLE = 0x1;
         const NON_WRITABLE = 0x2;

src/lib.rs

@@ -501,7 +501,7 @@ bitflags::bitflags! {
     #[cfg_attr(feature = "serialize", derive(Serialize))]
     #[cfg_attr(feature = "deserialize", derive(Deserialize))]
     #[cfg_attr(feature = "arbitrary", derive(Arbitrary))]
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
     pub struct StorageAccess: u32 {
         /// Storage can be used as a source for load ops.
         const LOAD = 0x1;
@@ -1195,7 +1195,7 @@ bitflags::bitflags! {
     #[cfg_attr(feature = "serialize", derive(Serialize))]
     #[cfg_attr(feature = "deserialize", derive(Deserialize))]
     #[cfg_attr(feature = "arbitrary", derive(Arbitrary))]
-    #[derive(Default)]
+    #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
     pub struct Barrier: u32 {
         /// Barrier affects all `AddressSpace::Storage` accesses.
         const STORAGE = 0x1;

src/valid/analyzer.rs

@@ -20,6 +20,7 @@ bitflags::bitflags! {
     /// Kinds of expressions that require uniform control flow.
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct UniformityRequirements: u8 {
         const WORK_GROUP_BARRIER = 0x1;
         const DERIVATIVE = 0x2;
@@ -59,6 +60,7 @@ impl Uniformity {
 }
 
 bitflags::bitflags! {
+    #[derive(Clone, Copy, Debug, PartialEq)]
     struct ExitFlags: u8 {
         /// Control flow may return from the function, which makes all the
         /// subsequent statements within the current function (only!)
@@ -117,6 +119,7 @@ bitflags::bitflags! {
     /// Indicates how a global variable is used.
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct GlobalUse: u8 {
         /// Data will be read from the variable.
         const READ = 0x1;

src/valid/function.rs

@@ -161,6 +161,7 @@ pub enum FunctionError {
 
 bitflags::bitflags! {
     #[repr(transparent)]
+    #[derive(Clone, Copy)]
     struct ControlFlowAbility: u8 {
         /// The control can return out of this block.
         const RETURN = 0x1;

src/valid/mod.rs

@@ -53,6 +53,7 @@ bitflags::bitflags! {
     /// by default.)
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct ValidationFlags: u8 {
         /// Expressions.
         #[cfg(feature = "validate")]
@@ -86,6 +87,7 @@ bitflags::bitflags! {
     #[must_use]
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct Capabilities: u16 {
         /// Support for [`AddressSpace:PushConstant`].
         const PUSH_CONSTANT = 0x1;
@@ -126,6 +128,7 @@ bitflags::bitflags! {
     /// Validation flags.
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct ShaderStages: u8 {
         const VERTEX = 0x1;
         const FRAGMENT = 0x2;

src/valid/type.rs

@@ -9,6 +9,7 @@ bitflags::bitflags! {
     #[cfg_attr(feature = "serialize", derive(serde::Serialize))]
     #[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
     #[repr(transparent)]
+    #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     pub struct TypeFlags: u8 {
         /// Can be used for data variables.
         ///

tests/in/bounds-check-image-restrict.param.ron

@@ -8,7 +8,7 @@
 	),
 	glsl: (
 		version: Desktop(430),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: { },
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/bounds-check-image-rzsw.param.ron

@@ -8,7 +8,7 @@
 	),
 	glsl: (
 		version: Desktop(430),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: { },
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/force_point_size_vertex_shader_webgl.param.ron

@@ -4,7 +4,7 @@
             version: 300,
             is_webgl: true
         ),
-        writer_flags: (bits: 16),
+        writer_flags: ("FORCE_POINT_SIZE"),
         binding_map: {},
         zero_initialize_workgroup_memory: true,
     ),

tests/in/functions-webgl.param.ron

@@ -4,7 +4,7 @@
 			version: 320,
 			is_webgl: false
 		),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: {},
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/interpolate.param.ron

@@ -8,7 +8,7 @@
 	),
 	glsl: (
 		version: Desktop(400),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: {},
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/invariant.param.ron

@@ -4,7 +4,7 @@
             version: 300,
             is_webgl: true
         ),
-        writer_flags: (bits: 0),
+        writer_flags: (""),
         binding_map: {},
         zero_initialize_workgroup_memory: true,
     ),

tests/in/multiview_webgl.param.ron

@@ -5,7 +5,7 @@
             version: 300,
 			is_webgl: true
 		),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: {},
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/push-constants.param.ron

@@ -5,7 +5,7 @@
 			version: 320,
 			is_webgl: false
 		),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: {},
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/quad.param.ron

@@ -9,7 +9,7 @@
 			version: 300,
 			is_webgl: false
 		),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: {},
 		zero_initialize_workgroup_memory: true,
 	),

tests/in/skybox.param.ron

@@ -42,7 +42,7 @@
 			version: 320,
 			is_webgl: false
 		),
-		writer_flags: (bits: 0),
+		writer_flags: (""),
 		binding_map: {
 			(group: 0, binding: 0): 0,
 			(group: 0, binding: 1): 0,