diff --git a/protokit_build/src/filegen/mod.rs b/protokit_build/src/filegen/mod.rs index 27ce3d3..aee9c7a 100644 --- a/protokit_build/src/filegen/mod.rs +++ b/protokit_build/src/filegen/mod.rs @@ -138,6 +138,7 @@ pub fn builtin_type_marker(typ: BuiltinType) -> &'static str { pub struct CodeGenerator<'a> { context: &'a FileSetDef, options: &'a Options, + types: Vec, output: Vec, } @@ -294,6 +295,7 @@ impl CodeGenerator<'_> { None }; + self.types.push(quote!{#ident}); self.output.push(quote! { #[derive(Debug, Default, Clone, PartialEq, Proto)] #attrs @@ -435,62 +437,11 @@ pub fn generate_file(ctx: &FileSetDef, opts: &Options, name: PathBuf, file: &Fil let mut generator = CodeGenerator { context: ctx, options: opts, + types: vec![], output: vec![], }; generator.file(file)?; - // - // let root = opts.import_root.clone(); - // - // let mut push_imports = HashSet::new(); - // let mut msg_types = vec![]; - // let mut messages = vec![]; - // let mut enums = vec![]; - // let mut services: Vec = vec![]; - // - // let generator = CodeGenerator { - // context: ctx, - // options: opts, - // }; - // - // for (idx, (_sym, msg)) in unit.messages.iter().enumerate() { - // let defid = (unit_id as u64) << 32 | LOCAL_DEFID_MSG as u64 | idx as u64; - // let (msg_contents, types, imports) = generator.generate_msg(&ctx.def, unit, defid, msg); - // push_imports.extend(imports); - // msg_types.extend(types.into_iter()); - // messages.push(msg_contents); - // } - // - // for (idx, (_name, en)) in unit.enums.iter().enumerate() { - // let _defid = (unit_id as u64) << 32 | LOCAL_DEFID_ENUM as u64 | idx as u64; - // enums.push(generator.generate_enum(en)); - // } - // - // for (_name, svc) in unit.services.iter() { - // services.push(generator.generate_server(unit, svc)); - // services.push(generator.generate_client(unit, svc)); - // } - // - - // - // let output = quote! { - // #![allow(nonstandard_style)] - // #![allow(unused)] - // #![deny(unused_must_use)] - // #![allow(clippy::derive_partial_eq_without_eq)] - // - // use core::fmt::Write; - // - // use #root::*; - // use #root as root; - // - // #(#imports)* - // - // - // #(#messages)* - // #(#enums)* - // #(#services)* - // }; let root = opts.import_root.clone(); let imports = file.imports.iter().map(|imp| imp.file_idx).map(|file_idx| { @@ -540,7 +491,10 @@ pub fn generate_file(ctx: &FileSetDef, opts: &Options, name: PathBuf, file: &Fil use #import::*; } }); + let output = generator.output; + let types = generator.types; + let output = quote! { #![allow(unused_imports)] #![allow(nonstandard_style)] @@ -548,8 +502,8 @@ pub fn generate_file(ctx: &FileSetDef, opts: &Options, name: PathBuf, file: &Fil #![allow(clippy::module_inception)] use #root::*; - pub fn register_types(_registry: &mut #root::textformat::reflect::Registry) { - // #(#files::register_types(registry);)* + pub fn register_types(registry: &mut #root::textformat::reflect::Registry) { + #(registry.register(&#types::default());)* } #(#imports)* diff --git a/protokit_desc/src/generated/google/protobuf/compiler/plugin.rs b/protokit_desc/src/generated/google/protobuf/compiler/plugin.rs index 9597d09..726f5b6 100644 --- a/protokit_desc/src/generated/google/protobuf/compiler/plugin.rs +++ b/protokit_desc/src/generated/google/protobuf/compiler/plugin.rs @@ -7,12 +7,16 @@ pub fn register_types(_registry: &mut crate::textformat::reflect::Registry) {} use super::super::descriptor::*; #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct CodeGeneratorResponseFeature(pub u32); -#[protoenum(closed)] +#[protoenum] impl CodeGeneratorResponseFeature { #[var(0u32, "FEATURE_NONE")] - pub const FEATURE_NONE: CodeGeneratorResponseFeature = CodeGeneratorResponseFeature(0u32); + pub const FEATURE_NONE: CodeGeneratorResponseFeature = CodeGeneratorResponseFeature( + 0u32, + ); #[var(1u32, "FEATURE_PROTO3_OPTIONAL")] - pub const FEATURE_PROTO3_OPTIONAL: CodeGeneratorResponseFeature = CodeGeneratorResponseFeature(1u32); + pub const FEATURE_PROTO3_OPTIONAL: CodeGeneratorResponseFeature = CodeGeneratorResponseFeature( + 1u32, + ); } #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct Version { diff --git a/protokit_desc/src/generated/google/protobuf/descriptor.rs b/protokit_desc/src/generated/google/protobuf/descriptor.rs index 0f899fe..e719167 100644 --- a/protokit_desc/src/generated/google/protobuf/descriptor.rs +++ b/protokit_desc/src/generated/google/protobuf/descriptor.rs @@ -6,7 +6,7 @@ use crate::*; pub fn register_types(_registry: &mut crate::textformat::reflect::Registry) {} #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct FieldDescriptorProtoType(pub u32); -#[protoenum(closed)] +#[protoenum] impl FieldDescriptorProtoType { #[var(1u32, "TYPE_DOUBLE")] pub const TYPE_DOUBLE: FieldDescriptorProtoType = FieldDescriptorProtoType(1u32); @@ -47,18 +47,24 @@ impl FieldDescriptorProtoType { } #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct FieldDescriptorProtoLabel(pub u32); -#[protoenum(closed)] +#[protoenum] impl FieldDescriptorProtoLabel { #[var(1u32, "LABEL_OPTIONAL")] - pub const LABEL_OPTIONAL: FieldDescriptorProtoLabel = FieldDescriptorProtoLabel(1u32); + pub const LABEL_OPTIONAL: FieldDescriptorProtoLabel = FieldDescriptorProtoLabel( + 1u32, + ); #[var(2u32, "LABEL_REQUIRED")] - pub const LABEL_REQUIRED: FieldDescriptorProtoLabel = FieldDescriptorProtoLabel(2u32); + pub const LABEL_REQUIRED: FieldDescriptorProtoLabel = FieldDescriptorProtoLabel( + 2u32, + ); #[var(3u32, "LABEL_REPEATED")] - pub const LABEL_REPEATED: FieldDescriptorProtoLabel = FieldDescriptorProtoLabel(3u32); + pub const LABEL_REPEATED: FieldDescriptorProtoLabel = FieldDescriptorProtoLabel( + 3u32, + ); } #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct FileOptionsOptimizeMode(pub u32); -#[protoenum(closed)] +#[protoenum] impl FileOptionsOptimizeMode { #[var(1u32, "SPEED")] pub const SPEED: FileOptionsOptimizeMode = FileOptionsOptimizeMode(1u32); @@ -69,7 +75,7 @@ impl FileOptionsOptimizeMode { } #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct FieldOptionsCType(pub u32); -#[protoenum(closed)] +#[protoenum] impl FieldOptionsCType { #[var(0u32, "STRING")] pub const STRING: FieldOptionsCType = FieldOptionsCType(0u32); @@ -80,7 +86,7 @@ impl FieldOptionsCType { } #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct FieldOptionsJSType(pub u32); -#[protoenum(closed)] +#[protoenum] impl FieldOptionsJSType { #[var(0u32, "JS_NORMAL")] pub const JS_NORMAL: FieldOptionsJSType = FieldOptionsJSType(0u32); @@ -91,14 +97,20 @@ impl FieldOptionsJSType { } #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct MethodOptionsIdempotencyLevel(pub u32); -#[protoenum(closed)] +#[protoenum] impl MethodOptionsIdempotencyLevel { #[var(0u32, "IDEMPOTENCY_UNKNOWN")] - pub const IDEMPOTENCY_UNKNOWN: MethodOptionsIdempotencyLevel = MethodOptionsIdempotencyLevel(0u32); + pub const IDEMPOTENCY_UNKNOWN: MethodOptionsIdempotencyLevel = MethodOptionsIdempotencyLevel( + 0u32, + ); #[var(1u32, "NO_SIDE_EFFECTS")] - pub const NO_SIDE_EFFECTS: MethodOptionsIdempotencyLevel = MethodOptionsIdempotencyLevel(1u32); + pub const NO_SIDE_EFFECTS: MethodOptionsIdempotencyLevel = MethodOptionsIdempotencyLevel( + 1u32, + ); #[var(2u32, "IDEMPOTENT")] - pub const IDEMPOTENT: MethodOptionsIdempotencyLevel = MethodOptionsIdempotencyLevel(2u32); + pub const IDEMPOTENT: MethodOptionsIdempotencyLevel = MethodOptionsIdempotencyLevel( + 2u32, + ); } #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct FileDescriptorSet { diff --git a/protokit_desc/src/generated/google/protobuf/mod.rs b/protokit_desc/src/generated/google/protobuf/mod.rs index 3f99af4..e66f904 100644 --- a/protokit_desc/src/generated/google/protobuf/mod.rs +++ b/protokit_desc/src/generated/google/protobuf/mod.rs @@ -1,16 +1,14 @@ pub mod any; pub mod compiler; pub mod descriptor; -pub mod duration; pub mod empty; pub mod field_mask; pub mod timestamp; pub fn register_types(registry: &mut crate::textformat::reflect::Registry) { - empty::register_types(registry); - descriptor::register_types(registry); - compiler::register_types(registry); - timestamp::register_types(registry); any::register_types(registry); - duration::register_types(registry); + compiler::register_types(registry); + descriptor::register_types(registry); + empty::register_types(registry); field_mask::register_types(registry); + timestamp::register_types(registry); } diff --git a/protokit_desc/src/generated/mod.rs b/protokit_desc/src/generated/mod.rs index bdada35..56c7bfa 100644 --- a/protokit_desc/src/generated/mod.rs +++ b/protokit_desc/src/generated/mod.rs @@ -1,6 +1,4 @@ pub mod google; -pub mod validate; pub fn register_types(registry: &mut crate::textformat::reflect::Registry) { google::register_types(registry); - validate::register_types(registry); } diff --git a/protokit_examples/build.rs b/protokit_examples/build.rs index b89b1df..f420aab 100644 --- a/protokit_examples/build.rs +++ b/protokit_examples/build.rs @@ -1,7 +1,7 @@ fn main() -> protokit_build::Result<()> { protokit_build::Build::new() .track_unknowns(true) - .borrow_bufs() + // .borrow_bufs() .include("../proto") .compile("google/protobuf/descriptor.proto")? .compile("google/protobuf/api.proto")? diff --git a/tools/conformance/src/gen/conformance/conformance.rs b/tools/conformance/src/gen/conformance/conformance.rs index cd40a79..64942ad 100644 --- a/tools/conformance/src/gen/conformance/conformance.rs +++ b/tools/conformance/src/gen/conformance/conformance.rs @@ -3,7 +3,12 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&FailureSet::default()); + registry.register(&ConformanceRequest::default()); + registry.register(&ConformanceResponse::default()); + registry.register(&JspbEncodingConfig::default()); +} #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct WireFormat(pub u32); #[protoenum] diff --git a/tools/conformance/src/gen/google/protobuf/any.rs b/tools/conformance/src/gen/google/protobuf/any.rs index 041754d..0d9b261 100644 --- a/tools/conformance/src/gen/google/protobuf/any.rs +++ b/tools/conformance/src/gen/google/protobuf/any.rs @@ -3,7 +3,9 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&Any::default()); +} #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct Any { #[field(1u32, "type_url", string, singular)] diff --git a/tools/conformance/src/gen/google/protobuf/duration.rs b/tools/conformance/src/gen/google/protobuf/duration.rs index 2e661ce..3166b7f 100644 --- a/tools/conformance/src/gen/google/protobuf/duration.rs +++ b/tools/conformance/src/gen/google/protobuf/duration.rs @@ -3,7 +3,9 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&Duration::default()); +} #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct Duration { #[field(1u32, "seconds", varint, singular)] diff --git a/tools/conformance/src/gen/google/protobuf/field_mask.rs b/tools/conformance/src/gen/google/protobuf/field_mask.rs index ee97698..8bfcb2d 100644 --- a/tools/conformance/src/gen/google/protobuf/field_mask.rs +++ b/tools/conformance/src/gen/google/protobuf/field_mask.rs @@ -3,7 +3,9 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&FieldMask::default()); +} #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct FieldMask { #[field(1u32, "paths", string, repeated)] diff --git a/tools/conformance/src/gen/google/protobuf/struct.rs b/tools/conformance/src/gen/google/protobuf/struct.rs index dea2d97..727022c 100644 --- a/tools/conformance/src/gen/google/protobuf/struct.rs +++ b/tools/conformance/src/gen/google/protobuf/struct.rs @@ -3,7 +3,11 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&Struct::default()); + registry.register(&Value::default()); + registry.register(&ListValue::default()); +} #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct NullValue(pub u32); #[protoenum] diff --git a/tools/conformance/src/gen/google/protobuf/timestamp.rs b/tools/conformance/src/gen/google/protobuf/timestamp.rs index d2b9031..ba44528 100644 --- a/tools/conformance/src/gen/google/protobuf/timestamp.rs +++ b/tools/conformance/src/gen/google/protobuf/timestamp.rs @@ -3,7 +3,9 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&Timestamp::default()); +} #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct Timestamp { #[field(1u32, "seconds", varint, singular)] diff --git a/tools/conformance/src/gen/google/protobuf/wrappers.rs b/tools/conformance/src/gen/google/protobuf/wrappers.rs index 28dca8c..0bfe7f1 100644 --- a/tools/conformance/src/gen/google/protobuf/wrappers.rs +++ b/tools/conformance/src/gen/google/protobuf/wrappers.rs @@ -3,7 +3,17 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&DoubleValue::default()); + registry.register(&FloatValue::default()); + registry.register(&Int64Value::default()); + registry.register(&UInt64Value::default()); + registry.register(&Int32Value::default()); + registry.register(&UInt32Value::default()); + registry.register(&BoolValue::default()); + registry.register(&StringValue::default()); + registry.register(&BytesValue::default()); +} #[derive(Debug, Default, Clone, PartialEq, Proto)] pub struct DoubleValue { #[field(1u32, "value", fixed64, singular)] diff --git a/tools/conformance/src/gen/protobuf_test_messages/proto2/test_messages_proto2.rs b/tools/conformance/src/gen/protobuf_test_messages/proto2/test_messages_proto2.rs index 71ab082..7343d3d 100644 --- a/tools/conformance/src/gen/protobuf_test_messages/proto2/test_messages_proto2.rs +++ b/tools/conformance/src/gen/protobuf_test_messages/proto2/test_messages_proto2.rs @@ -3,7 +3,27 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&TestAllTypesProto2NestedMessage::default()); + registry.register(&TestAllTypesProto2Data::default()); + registry.register(&TestAllTypesProto2MessageSetCorrect::default()); + registry.register(&TestAllTypesProto2MessageSetCorrectExtension1::default()); + registry.register(&TestAllTypesProto2MessageSetCorrectExtension2::default()); + registry.register(&TestAllTypesProto2::default()); + registry.register(&ForeignMessageProto2::default()); + registry.register(&UnknownToTestAllTypesOptionalGroup::default()); + registry.register(&UnknownToTestAllTypes::default()); + registry.register(&NullHypothesisProto2::default()); + registry.register(&EnumOnlyProto2::default()); + registry.register(&OneStringProto2::default()); + registry.register(&ProtoWithKeywords::default()); + registry.register(&TestAllRequiredTypesProto2NestedMessage::default()); + registry.register(&TestAllRequiredTypesProto2Data::default()); + registry.register(&TestAllRequiredTypesProto2MessageSetCorrect::default()); + registry.register(&TestAllRequiredTypesProto2MessageSetCorrectExtension1::default()); + registry.register(&TestAllRequiredTypesProto2MessageSetCorrectExtension2::default()); + registry.register(&TestAllRequiredTypesProto2::default()); +} #[derive(Default, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)] pub struct ForeignEnumProto2(pub u32); #[protoenum] diff --git a/tools/conformance/src/gen/protobuf_test_messages/proto3/test_messages_proto3.rs b/tools/conformance/src/gen/protobuf_test_messages/proto3/test_messages_proto3.rs index 63e005e..e1ded33 100644 --- a/tools/conformance/src/gen/protobuf_test_messages/proto3/test_messages_proto3.rs +++ b/tools/conformance/src/gen/protobuf_test_messages/proto3/test_messages_proto3.rs @@ -3,7 +3,13 @@ #![allow(unreachable_patterns)] #![allow(clippy::module_inception)] use ::protokit::*; -pub fn register_types(_registry: &mut ::protokit::textformat::reflect::Registry) {} +pub fn register_types(registry: &mut ::protokit::textformat::reflect::Registry) { + registry.register(&TestAllTypesProto3NestedMessage::default()); + registry.register(&TestAllTypesProto3::default()); + registry.register(&ForeignMessage::default()); + registry.register(&NullHypothesisProto3::default()); + registry.register(&EnumOnlyProto3::default()); +} use super::super::super::google::protobuf::any::*; use super::super::super::google::protobuf::duration::*; use super::super::super::google::protobuf::field_mask::*; diff --git a/tools/gendesc/Cargo.lock b/tools/gendesc/Cargo.lock index 11f7829..d8a16eb 100644 --- a/tools/gendesc/Cargo.lock +++ b/tools/gendesc/Cargo.lock @@ -67,6 +67,12 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" + [[package]] name = "bytecount" version = "0.6.3" @@ -283,25 +289,34 @@ checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "logos" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b031682c67a8e3d5446840f9573eb7fe26efe7ec8d195c9ac4c0647c502f1" +checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1" dependencies = [ "logos-derive", ] [[package]] -name = "logos-derive" -version = "0.12.1" +name = "logos-codegen" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d849148dbaf9661a6151d1ca82b13bb4c4c128146a88d05253b38d4e2f496c" +checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68" dependencies = [ "beef", "fnv", "proc-macro2", "quote", "regex-syntax", - "syn 1.0.98", + "syn 2.0.16", +] + +[[package]] +name = "logos-derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e" +dependencies = [ + "logos-codegen", ] [[package]] @@ -399,53 +414,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c623b5ad020c6dac110f85af16a213a9ac4efe41b50c4374cee8d838d36f378" dependencies = [ "proc-macro2", - "syn 2.0.10", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.98", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "syn 2.0.16", ] [[package]] name = "proc-macro2" -version = "1.0.52" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d0e1ae9e836cc3beddd63db0df682593d7e2d3d891ae8c9083d2113e1744224" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "protokit_binformat" -version = "0.0.1" +version = "0.0.2" dependencies = [ + "bumpalo", "indexmap", + "protokit_derive", "thiserror", ] [[package]] name = "protokit_build" -version = "0.0.1" +version = "0.0.2" dependencies = [ "anyhow", "convert_case", @@ -455,23 +448,22 @@ dependencies = [ "protokit_desc", "protokit_proto", "quote", - "syn 2.0.10", + "syn 2.0.16", ] [[package]] name = "protokit_derive" -version = "0.0.0" +version = "0.0.2" dependencies = [ "convert_case", - "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.16", ] [[package]] name = "protokit_desc" -version = "0.1.0" +version = "0.0.2" dependencies = [ "arcstr", "indexmap", @@ -482,7 +474,7 @@ dependencies = [ [[package]] name = "protokit_proto" -version = "0.0.1" +version = "0.0.2" dependencies = [ "indexmap", "lexical-core", @@ -498,7 +490,7 @@ dependencies = [ [[package]] name = "protokit_textformat" -version = "0.1.0" +version = "0.0.2" dependencies = [ "logos", "protokit_binformat", @@ -598,9 +590,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.10" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -645,7 +637,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn 2.0.16", ] [[package]] diff --git a/tools/gendesc/src/main.rs b/tools/gendesc/src/main.rs index 94ff004..2d4bb2d 100644 --- a/tools/gendesc/src/main.rs +++ b/tools/gendesc/src/main.rs @@ -15,6 +15,6 @@ fn main() -> protokit_build::Result<()> { .compile("google/protobuf/timestamp.proto")? .compile("google/protobuf/compiler/plugin.proto")? .compile("google/protobuf/any.proto")? - .compile("validate/validate.proto")? + // .compile("validate/validate.proto")? .generate() }