From 43f1d29622ba73613864d72b892d4b8c5eaf9c9c Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Fri, 25 Aug 2023 10:09:28 +1000
Subject: [PATCH] Update generator deps

---
 protocol_codegen/Cargo.toml                    | 9 ++++-----
 protocol_codegen/src/generate_messages/spec.rs | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/protocol_codegen/Cargo.toml b/protocol_codegen/Cargo.toml
index 1749e43..4f97e30 100644
--- a/protocol_codegen/Cargo.toml
+++ b/protocol_codegen/Cargo.toml
@@ -11,9 +11,8 @@ failure = "0.1.6"
 Inflector = { version = "0.11.4", default-features = false }
 serde = { version = "1.0.104", features = ["derive"] }
 serde_json = "1.0.48"
-serde_plain = "0.3.0"
-parse-display = "0.1.1"
+serde_plain = "1.0.1"
+parse-display = "0.8.1"
 json_comments = "0.2.0"
-assert-json-diff = "1.0.1"
-git2 = "0.16"
-uuid = { version = "0.8.2", features = ["v4", "serde" ] }
+assert-json-diff = "2.0.2"
+git2 = "0.17"
diff --git a/protocol_codegen/src/generate_messages/spec.rs b/protocol_codegen/src/generate_messages/spec.rs
index 08b9b84..050ac55 100644
--- a/protocol_codegen/src/generate_messages/spec.rs
+++ b/protocol_codegen/src/generate_messages/spec.rs
@@ -98,7 +98,7 @@ pub enum VersionSpec {
     Range(i16, i16),
 }
 derive_serialize_from_display!(VersionSpec);
-derive_deserialize_from_str!(VersionSpec, "valid version specification");
+derive_deserialize_from_fromstr!(VersionSpec, "valid version specification");
 
 impl VersionSpec {
     pub fn intersect(self, other: VersionSpec) -> VersionSpec {
@@ -144,8 +144,8 @@ pub enum PrimitiveType {
     Records,
     Uuid,
 }
-forward_display_to_serde!(PrimitiveType);
-forward_from_str_to_serde!(PrimitiveType);
+derive_display_from_serialize!(PrimitiveType);
+derive_fromstr_from_deserialize!(PrimitiveType);
 
 impl PrimitiveType {
     pub fn rust_name(&self) -> &str {
@@ -227,7 +227,7 @@ impl Display for TypeSpec {
     }
 }
 derive_serialize_from_display!(TypeSpec);
-derive_deserialize_from_str!(TypeSpec, "valid type specification");
+derive_deserialize_from_fromstr!(TypeSpec, "valid type specification");
 
 impl VersionSpec {
     pub fn is_none(&self) -> bool {