Update for bindgen 0.2.93, deprecating cargo-screeps (#533)

rustyscreeps · Aug 27, 2024 · 61ce820 · 61ce820
1 parent ea925b1
commit 61ce820
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,13 @@
 Unreleased
 ==========
 
+0.22.0 (2024-08-27)
+===================
+
 ### Breaking:
 
+- `cargo-screeps` is no longer supported as a deployment method, `wasm-bindgen` as of 0.2.93
+  generates code that needs transpiled; see the starter project's README for migration instructions
 - Change return type of `RoomXY::get_range_to` and input type of `RoomXY::in_range_to` to u8
 
 ### Additions:

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "screeps-game-api"
-version = "0.21.3"
+version = "0.22.0"
 authors = ["David Ross <[email protected]>"]
 documentation = "https://docs.rs/screeps-game-api/"
 edition = "2021"
@@ -39,7 +39,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 serde_repr = "0.1"
 serde-wasm-bindgen = "0.6"
-wasm-bindgen = "=0.2.92"
+wasm-bindgen = ">=0.2.93"
 
 [dev-dependencies]
 bincode = "1.3"

diff --git a/src/constants/types.rs b/src/constants/types.rs
@@ -834,7 +834,7 @@ mod test {
     #[test]
     fn resources_rust_to_serde_json_from_serde_json_roundtrip() {
         for resource in enum_iterator::all::<ResourceType>() {
-            if resource != ResourceType::__Nonexhaustive {
+            if resource != ResourceType::__Invalid {
                 let serialized = serde_json::to_string(&resource).unwrap();
                 let parsed: ResourceType = serde_json::from_str(&serialized).unwrap();
                 assert_eq!(resource, parsed);
@@ -845,7 +845,7 @@ mod test {
     #[test]
     fn resources_rust_to_display_from_str_roundtrip() {
         for resource in enum_iterator::all::<ResourceType>() {
-            if resource != ResourceType::__Nonexhaustive {
+            if resource != ResourceType::__Invalid {
                 let string = format!("{}", resource);
                 let parsed = ResourceType::from_str(&string).unwrap();
                 assert_eq!(resource, parsed);
@@ -857,7 +857,7 @@ mod test {
     fn resources_rust_vec_to_serde_json_from_serde_json_roundtrip() {
         let mut resources = vec![];
         for resource in enum_iterator::all::<ResourceType>() {
-            if resource != ResourceType::__Nonexhaustive {
+            if resource != ResourceType::__Invalid {
                 resources.push(resource);
             }
         }
@@ -870,7 +870,7 @@ mod test {
     fn resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values() {
         let mut resources = vec![];
         for resource in enum_iterator::all::<ResourceType>() {
-            if resource != ResourceType::__Nonexhaustive {
+            if resource != ResourceType::__Invalid {
                 resources.push(resource);
             }
         }
@@ -887,7 +887,7 @@ mod test {
     #[test]
     fn intershard_resources_rust_to_serde_json_from_serde_json_roundtrip() {
         for resource in enum_iterator::all::<IntershardResourceType>() {
-            if resource != IntershardResourceType::__Nonexhaustive {
+            if resource != IntershardResourceType::__Invalid {
                 let serialized = serde_json::to_string(&resource).unwrap();
                 let parsed: IntershardResourceType = serde_json::from_str(&serialized).unwrap();
                 assert_eq!(resource, parsed);
@@ -898,7 +898,7 @@ mod test {
     #[test]
     fn intershard_resources_rust_to_display_from_str_roundtrip() {
         for resource in enum_iterator::all::<IntershardResourceType>() {
-            if resource != IntershardResourceType::__Nonexhaustive {
+            if resource != IntershardResourceType::__Invalid {
                 let string = format!("{}", resource);
                 let parsed = IntershardResourceType::from_str(&string).unwrap();
                 assert_eq!(resource, parsed);
@@ -910,7 +910,7 @@ mod test {
     fn intershard_resources_rust_vec_to_serde_json_from_serde_json_roundtrip() {
         let mut resources = vec![];
         for resource in enum_iterator::all::<IntershardResourceType>() {
-            if resource != IntershardResourceType::__Nonexhaustive {
+            if resource != IntershardResourceType::__Invalid {
                 resources.push(resource);
             }
         }
@@ -924,7 +924,7 @@ mod test {
     fn intershard_resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values() {
         let mut resources = vec![];
         for resource in enum_iterator::all::<IntershardResourceType>() {
-            if resource != IntershardResourceType::__Nonexhaustive {
+            if resource != IntershardResourceType::__Invalid {
                 resources.push(resource);
             }
         }
@@ -941,11 +941,9 @@ mod test {
     #[test]
     fn market_resources_rust_to_serde_json_from_serde_json_roundtrip() {
         for resource in enum_iterator::all::<MarketResourceType>() {
-            if resource != MarketResourceType::Resource(ResourceType::__Nonexhaustive)
+            if resource != MarketResourceType::Resource(ResourceType::__Invalid)
                 && resource
-                    != MarketResourceType::IntershardResource(
-                        IntershardResourceType::__Nonexhaustive,
-                    )
+                    != MarketResourceType::IntershardResource(IntershardResourceType::__Invalid)
             {
                 let serialized = serde_json::to_string(&resource).unwrap();
                 let parsed: MarketResourceType = serde_json::from_str(&serialized).unwrap();
@@ -958,11 +956,9 @@ mod test {
     fn market_resources_rust_vec_to_serde_json_from_serde_json_roundtrip() {
         let mut resources = vec![];
         for resource in enum_iterator::all::<MarketResourceType>() {
-            if resource != MarketResourceType::Resource(ResourceType::__Nonexhaustive)
+            if resource != MarketResourceType::Resource(ResourceType::__Invalid)
                 && resource
-                    != MarketResourceType::IntershardResource(
-                        IntershardResourceType::__Nonexhaustive,
-                    )
+                    != MarketResourceType::IntershardResource(IntershardResourceType::__Invalid)
             {
                 resources.push(resource);
             }
@@ -977,11 +973,9 @@ mod test {
     fn market_resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values() {
         let mut resources = vec![];
         for resource in enum_iterator::all::<MarketResourceType>() {
-            if resource != MarketResourceType::Resource(ResourceType::__Nonexhaustive)
+            if resource != MarketResourceType::Resource(ResourceType::__Invalid)
                 && resource
-                    != MarketResourceType::IntershardResource(
-                        IntershardResourceType::__Nonexhaustive,
-                    )
+                    != MarketResourceType::IntershardResource(IntershardResourceType::__Invalid)
             {
                 resources.push(resource);
             }

diff --git a/src/lib.rs b/src/lib.rs
@@ -94,6 +94,10 @@
 
 // #![warn(clippy::missing_const_for_fn)]
 
+// disable deprecation warnings - TODO need to figure out how to get wasm_bindgen's new thread_local
+// attribute working
+#![allow(deprecated)]
+
 pub mod console;
 pub mod constants;
 pub mod enums;