Merge pull request #1452 from sdroege/bitflags-2.0

Update to bitflags 2.0
gtk-rs · Mar 14, 2023 · c405d37 · c405d37
2 parents d09789d + 68475b8
commit c405d37
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 69 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ exclude = ["Gir*.toml", "tests/**/*", "*.md", "generator.py"]
 edition = "2021"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 getopts = "0.2.21"
 getter_rules = { package = "fix-getters-rules", version = "0.3.0", default-features = false }
 xml-rs = "0.8"

diff --git a/book/src/tutorial/high_level_rust_api.md b/book/src/tutorial/high_level_rust_api.md
@@ -24,7 +24,7 @@ For our example, this results in the following dependencies:
 ```toml
 [dependencies]
 libc = "0.2"
-bitflags = "1.0"
+bitflags = "2.0"
 
 [dependencies.ffi]
 package = "pango-sys"

diff --git a/src/codegen/flags.rs b/src/codegen/flags.rs
@@ -96,6 +96,7 @@ fn generate_flags(
     if let Some(ref d) = config.derives {
         derives(w, d, 1)?;
     }
+    writeln!(w, "    #[derive(Clone, Copy, Debug, PartialEq, Eq)]")?;
 
     doc_alias(w, &flags.c_type, "", 1)?;
     writeln!(

diff --git a/src/config/property_generate_flags.rs b/src/config/property_generate_flags.rs
@@ -5,6 +5,7 @@ use bitflags::bitflags;
 use super::error::TomlHelper;
 
 bitflags! {
+    #[derive(Clone, Copy, Debug, PartialEq, Eq)]
     pub struct PropertyGenerateFlags: u32 {
         const GET = 1;
         const SET = 2;

diff --git a/tests/sys/atk-sys/Cargo.toml b/tests/sys/atk-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.glib]

diff --git a/tests/sys/gdk-pixbuf-sys/Cargo.toml b/tests/sys/gdk-pixbuf-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.gio]

diff --git a/tests/sys/gdk-sys/Cargo.toml b/tests/sys/gdk-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.cairo]

diff --git a/tests/sys/gio-sys/Cargo.toml b/tests/sys/gio-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.glib]

diff --git a/tests/sys/glib-sys/Cargo.toml b/tests/sys/glib-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [features]

diff --git a/tests/sys/gobject-sys/Cargo.toml b/tests/sys/gobject-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.glib]

diff --git a/tests/sys/gtk-sys/Cargo.toml b/tests/sys/gtk-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.atk]

diff --git a/tests/sys/pango-sys/Cargo.toml b/tests/sys/pango-sys/Cargo.toml
@@ -3,7 +3,7 @@ pkg-config = "0.3.7"
 system-deps = "6"
 
 [dependencies]
-bitflags = "1.0"
+bitflags = "2.0"
 libc = "0.2"
 
 [dependencies.glib]