Skip to content

Commit 95dec58

Browse files
authored
Prep 0.21.3 release, downgrading wasm-bindgen to compatible version (#530)
1 parent 1446914 commit 95dec58

File tree

4 files changed

+27
-21
lines changed

4 files changed

+27
-21
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
Unreleased
22
==========
33

4+
### Bugfixes:
5+
6+
- Temporarily pin to wasm-bindgen 0.2.92 due to incompatible generated javascript
7+
48
0.21.2 (2024-08-14)
59
===================
610

711
### Bugfixes:
812

9-
- Update for new string enum implementation's implementation in wasm-bindgen 0.2.93
13+
- Update for new string enum implementation in wasm-bindgen 0.2.93
1014

1115
### Misc:
1216

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "screeps-game-api"
3-
version = "0.21.2"
3+
version = "0.21.3"
44
authors = ["David Ross <[email protected]>"]
55
documentation = "https://docs.rs/screeps-game-api/"
66
edition = "2021"
@@ -39,7 +39,7 @@ serde = { version = "1", features = ["derive"] }
3939
serde_json = "1"
4040
serde_repr = "0.1"
4141
serde-wasm-bindgen = "0.6"
42-
wasm-bindgen = "0.2"
42+
wasm-bindgen = "=0.2.92"
4343

4444
[dev-dependencies]
4545
bincode = "1.3"

src/constants/types.rs

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@ mod test {
834834
#[test]
835835
fn resources_rust_to_serde_json_from_serde_json_roundtrip() {
836836
for resource in enum_iterator::all::<ResourceType>() {
837-
if resource != ResourceType::__Invalid {
837+
if resource != ResourceType::__Nonexhaustive {
838838
let serialized = serde_json::to_string(&resource).unwrap();
839839
let parsed: ResourceType = serde_json::from_str(&serialized).unwrap();
840840
assert_eq!(resource, parsed);
@@ -845,7 +845,7 @@ mod test {
845845
#[test]
846846
fn resources_rust_to_display_from_str_roundtrip() {
847847
for resource in enum_iterator::all::<ResourceType>() {
848-
if resource != ResourceType::__Invalid {
848+
if resource != ResourceType::__Nonexhaustive {
849849
let string = format!("{}", resource);
850850
let parsed = ResourceType::from_str(&string).unwrap();
851851
assert_eq!(resource, parsed);
@@ -857,7 +857,7 @@ mod test {
857857
fn resources_rust_vec_to_serde_json_from_serde_json_roundtrip() {
858858
let mut resources = vec![];
859859
for resource in enum_iterator::all::<ResourceType>() {
860-
if resource != ResourceType::__Invalid {
860+
if resource != ResourceType::__Nonexhaustive {
861861
resources.push(resource);
862862
}
863863
}
@@ -870,7 +870,7 @@ mod test {
870870
fn resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values() {
871871
let mut resources = vec![];
872872
for resource in enum_iterator::all::<ResourceType>() {
873-
if resource != ResourceType::__Invalid {
873+
if resource != ResourceType::__Nonexhaustive {
874874
resources.push(resource);
875875
}
876876
}
@@ -887,7 +887,7 @@ mod test {
887887
#[test]
888888
fn intershard_resources_rust_to_serde_json_from_serde_json_roundtrip() {
889889
for resource in enum_iterator::all::<IntershardResourceType>() {
890-
if resource != IntershardResourceType::__Invalid {
890+
if resource != IntershardResourceType::__Nonexhaustive {
891891
let serialized = serde_json::to_string(&resource).unwrap();
892892
let parsed: IntershardResourceType = serde_json::from_str(&serialized).unwrap();
893893
assert_eq!(resource, parsed);
@@ -898,7 +898,7 @@ mod test {
898898
#[test]
899899
fn intershard_resources_rust_to_display_from_str_roundtrip() {
900900
for resource in enum_iterator::all::<IntershardResourceType>() {
901-
if resource != IntershardResourceType::__Invalid {
901+
if resource != IntershardResourceType::__Nonexhaustive {
902902
let string = format!("{}", resource);
903903
let parsed = IntershardResourceType::from_str(&string).unwrap();
904904
assert_eq!(resource, parsed);
@@ -910,7 +910,7 @@ mod test {
910910
fn intershard_resources_rust_vec_to_serde_json_from_serde_json_roundtrip() {
911911
let mut resources = vec![];
912912
for resource in enum_iterator::all::<IntershardResourceType>() {
913-
if resource != IntershardResourceType::__Invalid {
913+
if resource != IntershardResourceType::__Nonexhaustive {
914914
resources.push(resource);
915915
}
916916
}
@@ -924,7 +924,7 @@ mod test {
924924
fn intershard_resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values() {
925925
let mut resources = vec![];
926926
for resource in enum_iterator::all::<IntershardResourceType>() {
927-
if resource != IntershardResourceType::__Invalid {
927+
if resource != IntershardResourceType::__Nonexhaustive {
928928
resources.push(resource);
929929
}
930930
}
@@ -941,9 +941,11 @@ mod test {
941941
#[test]
942942
fn market_resources_rust_to_serde_json_from_serde_json_roundtrip() {
943943
for resource in enum_iterator::all::<MarketResourceType>() {
944-
if resource != MarketResourceType::Resource(ResourceType::__Invalid)
944+
if resource != MarketResourceType::Resource(ResourceType::__Nonexhaustive)
945945
&& resource
946-
!= MarketResourceType::IntershardResource(IntershardResourceType::__Invalid)
946+
!= MarketResourceType::IntershardResource(
947+
IntershardResourceType::__Nonexhaustive,
948+
)
947949
{
948950
let serialized = serde_json::to_string(&resource).unwrap();
949951
let parsed: MarketResourceType = serde_json::from_str(&serialized).unwrap();
@@ -956,9 +958,11 @@ mod test {
956958
fn market_resources_rust_vec_to_serde_json_from_serde_json_roundtrip() {
957959
let mut resources = vec![];
958960
for resource in enum_iterator::all::<MarketResourceType>() {
959-
if resource != MarketResourceType::Resource(ResourceType::__Invalid)
961+
if resource != MarketResourceType::Resource(ResourceType::__Nonexhaustive)
960962
&& resource
961-
!= MarketResourceType::IntershardResource(IntershardResourceType::__Invalid)
963+
!= MarketResourceType::IntershardResource(
964+
IntershardResourceType::__Nonexhaustive,
965+
)
962966
{
963967
resources.push(resource);
964968
}
@@ -973,9 +977,11 @@ mod test {
973977
fn market_resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values() {
974978
let mut resources = vec![];
975979
for resource in enum_iterator::all::<MarketResourceType>() {
976-
if resource != MarketResourceType::Resource(ResourceType::__Invalid)
980+
if resource != MarketResourceType::Resource(ResourceType::__Nonexhaustive)
977981
&& resource
978-
!= MarketResourceType::IntershardResource(IntershardResourceType::__Invalid)
982+
!= MarketResourceType::IntershardResource(
983+
IntershardResourceType::__Nonexhaustive,
984+
)
979985
{
980986
resources.push(resource);
981987
}

src/lib.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@
9494

9595
// #![warn(clippy::missing_const_for_fn)]
9696

97-
// disable deprecation warnings - TODO need to figure out how to get wasm_bindgen's new thread_local
98-
// attribute working
99-
#![allow(deprecated)]
100-
10197
pub mod console;
10298
pub mod constants;
10399
pub mod enums;

0 commit comments

Comments
 (0)