@@ -834,7 +834,7 @@ mod test {
834
834
#[ test]
835
835
fn resources_rust_to_serde_json_from_serde_json_roundtrip ( ) {
836
836
for resource in enum_iterator:: all :: < ResourceType > ( ) {
837
- if resource != ResourceType :: __Invalid {
837
+ if resource != ResourceType :: __Nonexhaustive {
838
838
let serialized = serde_json:: to_string ( & resource) . unwrap ( ) ;
839
839
let parsed: ResourceType = serde_json:: from_str ( & serialized) . unwrap ( ) ;
840
840
assert_eq ! ( resource, parsed) ;
@@ -845,7 +845,7 @@ mod test {
845
845
#[ test]
846
846
fn resources_rust_to_display_from_str_roundtrip ( ) {
847
847
for resource in enum_iterator:: all :: < ResourceType > ( ) {
848
- if resource != ResourceType :: __Invalid {
848
+ if resource != ResourceType :: __Nonexhaustive {
849
849
let string = format ! ( "{}" , resource) ;
850
850
let parsed = ResourceType :: from_str ( & string) . unwrap ( ) ;
851
851
assert_eq ! ( resource, parsed) ;
@@ -857,7 +857,7 @@ mod test {
857
857
fn resources_rust_vec_to_serde_json_from_serde_json_roundtrip ( ) {
858
858
let mut resources = vec ! [ ] ;
859
859
for resource in enum_iterator:: all :: < ResourceType > ( ) {
860
- if resource != ResourceType :: __Invalid {
860
+ if resource != ResourceType :: __Nonexhaustive {
861
861
resources. push ( resource) ;
862
862
}
863
863
}
@@ -870,7 +870,7 @@ mod test {
870
870
fn resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values ( ) {
871
871
let mut resources = vec ! [ ] ;
872
872
for resource in enum_iterator:: all :: < ResourceType > ( ) {
873
- if resource != ResourceType :: __Invalid {
873
+ if resource != ResourceType :: __Nonexhaustive {
874
874
resources. push ( resource) ;
875
875
}
876
876
}
@@ -887,7 +887,7 @@ mod test {
887
887
#[ test]
888
888
fn intershard_resources_rust_to_serde_json_from_serde_json_roundtrip ( ) {
889
889
for resource in enum_iterator:: all :: < IntershardResourceType > ( ) {
890
- if resource != IntershardResourceType :: __Invalid {
890
+ if resource != IntershardResourceType :: __Nonexhaustive {
891
891
let serialized = serde_json:: to_string ( & resource) . unwrap ( ) ;
892
892
let parsed: IntershardResourceType = serde_json:: from_str ( & serialized) . unwrap ( ) ;
893
893
assert_eq ! ( resource, parsed) ;
@@ -898,7 +898,7 @@ mod test {
898
898
#[ test]
899
899
fn intershard_resources_rust_to_display_from_str_roundtrip ( ) {
900
900
for resource in enum_iterator:: all :: < IntershardResourceType > ( ) {
901
- if resource != IntershardResourceType :: __Invalid {
901
+ if resource != IntershardResourceType :: __Nonexhaustive {
902
902
let string = format ! ( "{}" , resource) ;
903
903
let parsed = IntershardResourceType :: from_str ( & string) . unwrap ( ) ;
904
904
assert_eq ! ( resource, parsed) ;
@@ -910,7 +910,7 @@ mod test {
910
910
fn intershard_resources_rust_vec_to_serde_json_from_serde_json_roundtrip ( ) {
911
911
let mut resources = vec ! [ ] ;
912
912
for resource in enum_iterator:: all :: < IntershardResourceType > ( ) {
913
- if resource != IntershardResourceType :: __Invalid {
913
+ if resource != IntershardResourceType :: __Nonexhaustive {
914
914
resources. push ( resource) ;
915
915
}
916
916
}
@@ -924,7 +924,7 @@ mod test {
924
924
fn intershard_resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values ( ) {
925
925
let mut resources = vec ! [ ] ;
926
926
for resource in enum_iterator:: all :: < IntershardResourceType > ( ) {
927
- if resource != IntershardResourceType :: __Invalid {
927
+ if resource != IntershardResourceType :: __Nonexhaustive {
928
928
resources. push ( resource) ;
929
929
}
930
930
}
@@ -941,9 +941,11 @@ mod test {
941
941
#[ test]
942
942
fn market_resources_rust_to_serde_json_from_serde_json_roundtrip ( ) {
943
943
for resource in enum_iterator:: all :: < MarketResourceType > ( ) {
944
- if resource != MarketResourceType :: Resource ( ResourceType :: __Invalid )
944
+ if resource != MarketResourceType :: Resource ( ResourceType :: __Nonexhaustive )
945
945
&& resource
946
- != MarketResourceType :: IntershardResource ( IntershardResourceType :: __Invalid)
946
+ != MarketResourceType :: IntershardResource (
947
+ IntershardResourceType :: __Nonexhaustive,
948
+ )
947
949
{
948
950
let serialized = serde_json:: to_string ( & resource) . unwrap ( ) ;
949
951
let parsed: MarketResourceType = serde_json:: from_str ( & serialized) . unwrap ( ) ;
@@ -956,9 +958,11 @@ mod test {
956
958
fn market_resources_rust_vec_to_serde_json_from_serde_json_roundtrip ( ) {
957
959
let mut resources = vec ! [ ] ;
958
960
for resource in enum_iterator:: all :: < MarketResourceType > ( ) {
959
- if resource != MarketResourceType :: Resource ( ResourceType :: __Invalid )
961
+ if resource != MarketResourceType :: Resource ( ResourceType :: __Nonexhaustive )
960
962
&& resource
961
- != MarketResourceType :: IntershardResource ( IntershardResourceType :: __Invalid)
963
+ != MarketResourceType :: IntershardResource (
964
+ IntershardResourceType :: __Nonexhaustive,
965
+ )
962
966
{
963
967
resources. push ( resource) ;
964
968
}
@@ -973,9 +977,11 @@ mod test {
973
977
fn market_resources_rust_vec_to_serde_json_from_serde_json_roundtrip_via_values ( ) {
974
978
let mut resources = vec ! [ ] ;
975
979
for resource in enum_iterator:: all :: < MarketResourceType > ( ) {
976
- if resource != MarketResourceType :: Resource ( ResourceType :: __Invalid )
980
+ if resource != MarketResourceType :: Resource ( ResourceType :: __Nonexhaustive )
977
981
&& resource
978
- != MarketResourceType :: IntershardResource ( IntershardResourceType :: __Invalid)
982
+ != MarketResourceType :: IntershardResource (
983
+ IntershardResourceType :: __Nonexhaustive,
984
+ )
979
985
{
980
986
resources. push ( resource) ;
981
987
}
0 commit comments