chore: Updated bindgen, and edition

Author: Dennis Waldherr

Cargo.lock

@@ -3,7 +3,7 @@ name = "rsbwapi"
 version.workspace = true
 authors = ["Dennis Waldherr <bytekeeper@mailbox.org>"]
 description = "BWAPI client to write AI players for Starcraft Broodwar"
-edition = "2021"
+edition = "2024"
 license = "MIT OR Apache-2.0"
 homepage = "https://github.com/Bytekeeper/rsbwapi/"
 repository = "https://github.com/Bytekeeper/rsbwapi/"

Cargo.toml

@@ -2,7 +2,7 @@
 name = "bwapi_wrapper"
 version.workspace = true
 authors = ["Dennis Waldherr <bytekeeper@mailbox.org>"]
-edition = "2021"
+edition = "2024"
 homepage = "https://github.com/Bytekeeper/rsbwapi/"
 license = "LGPL-3.0-or-later"
 repository = "https://github.com/Bytekeeper/rsbwapi/"
@@ -23,6 +23,5 @@ derive_more.workspace = true
 
 
 [build-dependencies]
-# bindgen = "0.69"
-# regex = "1"
-
+bindgen = "0.72"
+regex = "1"

bwapi_wrapper/Cargo.toml

@@ -1,14 +1,13 @@
-// use bindgen::Formatter;
-// use regex::Regex;
-// use std::env;
-// use std::fs::File;
-// use std::io::Write;
-// use std::path::PathBuf;
+use bindgen::Formatter;
+use regex::Regex;
+use std::env;
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
 
 fn main() {
     // To "fix" it not working on github and to reduce build requirements - this will not be called
     // in every build.
-    /*
     should_replace1();
     should_replace2();
 
@@ -23,27 +22,27 @@ fn main() {
         .default_enum_style(bindgen::EnumVariation::Rust {
             non_exhaustive: false,
         })
-        .allowlist_type("BWAPI::.*")
-        //        .whitelist_type("BWAPI::.*GameTable")
-        //      .whitelist_type("BWAPI::.*Enum")
+        .allowlist_type("BWAPI::(GameTable|.*Enum|MouseButton|Key|UnitData|RegionData|GameData)")
+        .allowlist_type("BWAPIC::(UnitCommand|.*Enum)")
         .ignore_methods()
         .ignore_functions()
         .opaque_type("std::.*")
         .formatter(Formatter::Rustfmt)
         // .derive_default(true)
-        .derive_eq(true)
+        // .derive_eq(true)
         .derive_hash(true)
         //        .disable_name_namespacing()
         // The input header we would like to generate
         // bindings for.
         .header("wrapper.h")
+        // .clang_arg("--target=i686-unknown-linux-gnu")
         // Finish the builder and generate the bindings.
         .generate()
         // Unwrap the Result and panic on failure.
         .expect("Unable to generate bindings");
 
     // Write the bindings to the $OUT_DIR/bindings.rs file.
-    todo!("Target src/");
+    // todo!("Target src/");
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
     let result = bindings.to_string();
     let mut file = File::create(out_path.join("bindings.rs")).unwrap();
@@ -52,29 +51,34 @@ fn main() {
     assert_ne!(changed, result, "Could not add FromPrimitive to bindings!");
     file.write_all(changed.as_bytes())
         .expect("Couldn't write bindings!");
-        */
 }
 
-// fn should_replace1() {
-//     // GIVEN
-//     let test = "# [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum std_deque__bindgen_ty_1";
+fn should_replace1() {
+    // GIVEN
+    let test = "# [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum std_deque__bindgen_ty_1";
 
-//     // WHEN
-//     let re = Regex::new(r"#\s*\[\s*derive\s*\((?P<d>[^)]+)\)\s*\]\s*pub\s+enum").unwrap();
-//     let changed = re.replace_all(test, "#[derive($d, FromPrimitive)]\npub enum");
+    // WHEN
+    let re = Regex::new(r"#\s*\[\s*derive\s*\((?P<d>[^)]+)\)\s*\]\s*pub\s+enum").unwrap();
+    let changed = re.replace_all(test, "#[derive($d, FromPrimitive)]\npub enum");
 
-//     // THEN
-//     assert_eq!("#[derive( Debug , Copy , Clone , PartialEq , Eq , Hash , FromPrimitive)]\npub enum std_deque__bindgen_ty_1", changed);
-// }
+    // THEN
+    assert_eq!(
+        "#[derive( Debug , Copy , Clone , PartialEq , Eq , Hash , FromPrimitive)]\npub enum std_deque__bindgen_ty_1",
+        changed
+    );
+}
 
-// fn should_replace2() {
-//     // GIVEN
-//     let test = "# [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum BWAPI_Text_Size_Enum # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum BWAPIC_CommandType_Enum ";
+fn should_replace2() {
+    // GIVEN
+    let test = "# [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum BWAPI_Text_Size_Enum # [ derive ( Debug , Copy , Clone , PartialEq , Eq , Hash ) ] pub enum BWAPIC_CommandType_Enum ";
 
-//     // WHEN
-//     let re = Regex::new(r"#\s*\[\s*derive\s*\((?P<d>[^)]+)\)\s*\]\s*pub\s+enum").unwrap();
-//     let changed = re.replace_all(test, "#[derive($d, FromPrimitive)]\npub enum");
+    // WHEN
+    let re = Regex::new(r"#\s*\[\s*derive\s*\((?P<d>[^)]+)\)\s*\]\s*pub\s+enum").unwrap();
+    let changed = re.replace_all(test, "#[derive($d, FromPrimitive)]\npub enum");
 
-//     // THEN
-//     assert_eq!("#[derive( Debug , Copy , Clone , PartialEq , Eq , Hash , FromPrimitive)]\npub enum BWAPI_Text_Size_Enum #[derive( Debug , Copy , Clone , PartialEq , Eq , Hash , FromPrimitive)]\npub enum BWAPIC_CommandType_Enum ", changed);
-// }
+    // THEN
+    assert_eq!(
+        "#[derive( Debug , Copy , Clone , PartialEq , Eq , Hash , FromPrimitive)]\npub enum BWAPI_Text_Size_Enum #[derive( Debug , Copy , Clone , PartialEq , Eq , Hash , FromPrimitive)]\npub enum BWAPIC_CommandType_Enum ",
+        changed
+    );
+}