Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update generator deps #31

Merged
merged 2 commits into from
Sep 16, 2023
Merged

Update generator deps #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43f1d29
Update generator deps
rukai Aug 25, 2023
0e06f54
Merge branch 'main' into update-deps-generator
Sep 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions protocol_codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
8 changes: 4 additions & 4 deletions protocol_codegen/src/generate_messages/spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
Loading