Bump bitflags to 2.0.0 (#2666)

Updated `bitflags`, overrides #2665.
boa-dev · Mar 14, 2023 · 0a843d2 · 0a843d2
1 parent 6173a73
commit 0a843d2
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/boa_ast/Cargo.toml b/boa_ast/Cargo.toml
@@ -11,14 +11,14 @@ repository.workspace = true
 rust-version.workspace = true
 
 [features]
-serde = ["dep:serde", "boa_interner/serde"]
+serde = ["dep:serde", "boa_interner/serde", "bitflags/serde"]
 arbitrary = ["dep:arbitrary", "boa_interner/arbitrary", "num-bigint/arbitrary"]
 
 [dependencies]
 boa_interner.workspace = true
 boa_macros.workspace = true
 rustc-hash = "1.1.0"
-bitflags = "1.3.2"
+bitflags = "2.0.0"
 num-bigint = "0.4.3"
 serde = { version = "1.0.156", features = ["derive"], optional = true }
 arbitrary = { version = "1", features = ["derive"], optional = true }
diff --git a/boa_ast/src/function/parameters.rs b/boa_ast/src/function/parameters.rs
@@ -176,7 +176,7 @@ impl<'a> arbitrary::Arbitrary<'a> for FormalParameterList {
 
 bitflags! {
     /// Flags for a [`FormalParameterList`].
-    #[allow(clippy::unsafe_derive_deserialize)]
+    #[derive(Debug, Copy, Clone, PartialEq)]
     #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
     pub struct FormalParameterListFlags: u8 {
         /// Has only identifier parameters with no initialization expressions.

diff --git a/boa_engine/Cargo.toml b/boa_engine/Cargo.toml
@@ -51,7 +51,7 @@ regress = "0.5.0"
 rustc-hash = "1.1.0"
 num-bigint = { version = "0.4.3", features = ["serde"] }
 num-integer = "0.1.45"
-bitflags = "1.3.2"
+bitflags = "2.0.0"
 indexmap = "1.9.2"
 ryu-js = "0.2.2"
 chrono = { version = "0.4.24", default-features = false, features = ["clock", "std", "wasmbind"] }

diff --git a/boa_engine/src/bytecompiler/jump_control.rs b/boa_engine/src/bytecompiler/jump_control.rs
@@ -26,6 +26,7 @@ pub(crate) struct JumpControlInfo {
 
 bitflags! {
     /// A bitflag that contains the type flags and relevant booleans for `JumpControlInfo`.
+    #[derive(Debug, Clone, Copy)]
     pub(crate) struct JumpControlInfoFlags: u8 {
         const LOOP = 0b0000_0001;
         const SWITCH = 0b0000_0010;

diff --git a/boa_engine/src/property/attribute/mod.rs b/boa_engine/src/property/attribute/mod.rs
@@ -15,6 +15,7 @@ bitflags! {
     ///  - `[[Configurable]]` (`CONFIGURABLE`) - If `false`, attempts to delete the property,
     /// change the property to be an `accessor property`, or change its attributes (other than `[[Value]]`,
     /// or changing `[[Writable]]` to `false`) will fail.
+    #[derive(Debug, Clone, Copy)]
     pub struct Attribute: u8 {
         /// The `Writable` attribute decides whether the value associated with the property can be changed or not, from its initial value.
         const WRITABLE = 0b0000_0001;
@@ -40,7 +41,7 @@ impl Attribute {
     /// Clear all flags.
     #[inline]
     pub fn clear(&mut self) {
-        self.bits = 0;
+        *self.0.bits_mut() = 0;
     }
 
     /// Sets the `writable` flag.

diff --git a/boa_parser/Cargo.toml b/boa_parser/Cargo.toml
@@ -19,6 +19,6 @@ boa_unicode.workspace = true
 rustc-hash = "1.1.0"
 fast-float = "0.2.0"
 num-traits = "0.2.15"
-bitflags = "1.3.2"
+bitflags = "2.0.0"
 num-bigint = "0.4.3"
 regress = "0.5.0"
diff --git a/boa_parser/src/lexer/regex.rs b/boa_parser/src/lexer/regex.rs
@@ -146,7 +146,7 @@ impl<R> Tokenizer<R> for RegexLiteral {
 
 bitflags! {
     /// Flags of a regular expression.
-    #[derive(Default)]
+    #[derive(Debug, Default, Copy, Clone)]
     pub struct RegExpFlags: u8 {
         /// Whether to test the regular expression against all possible matches in a string,
         /// or only against the first.

diff --git a/boa_tester/Cargo.toml b/boa_tester/Cargo.toml
@@ -18,7 +18,7 @@ clap = { version = "4.1.8", features = ["derive"] }
 serde = { version = "1.0.156", features = ["derive"] }
 serde_yaml = "0.9.19"
 serde_json = "1.0.94"
-bitflags = "1.3.2"
+bitflags = "2.0.0"
 regex = "1.7.1"
 once_cell = "1.17.1"
 colored = "2.0.0"

diff --git a/boa_tester/src/main.rs b/boa_tester/src/main.rs
@@ -444,6 +444,7 @@ impl From<Option<Negative>> for Outcome {
 }
 
 bitflags! {
+    #[derive(Debug, Clone, Copy)]
     struct TestFlags: u16 {
         const STRICT = 0b0_0000_0001;
         const NO_STRICT = 0b0_0000_0010;