Add message and enum attributes https://github.com/tokio-rs/prost/rel…

…eases/tag/v0.11.6
neoeinstein · Jan 28, 2023 · 038cd34 · 038cd34
1 parent 39faedb
commit 038cd34
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/protoc-gen-prost-crate/Cargo.toml b/protoc-gen-prost-crate/Cargo.toml
@@ -16,8 +16,8 @@ categories = ["encoding"]
 
 [dependencies]
 once_cell = "1.10.0"
-prost-build = { version = ">=0.11.0, <0.11.2", default-features = false }
-prost-types = { version = "0.11.0", default-features = false }
+prost-build = { version = "0.11.6", default-features = false }
+prost-types = { version = "0.11.6", default-features = false }
 prost = { version = "0.11.0", default-features = false, features = ["std"] }
 protoc-gen-prost = { version = "0.2.0", path = "../protoc-gen-prost" }
 regex = { version = "1.5.5", default-features = false }

diff --git a/protoc-gen-prost-serde/Cargo.toml b/protoc-gen-prost-serde/Cargo.toml
@@ -16,8 +16,8 @@ categories = ["encoding"]
 
 [dependencies]
 pbjson-build = "0.5.1"
-prost-build = { version = ">=0.11.0, <0.11.2", default-features = false }
-prost-types = { version = "0.11.0", default-features = false }
+prost-build = { version = "0.11.6", default-features = false }
+prost-types = { version = "0.11.6", default-features = false }
 prost = { version = "0.11.0", default-features = false, features = ["std"] }
 protoc-gen-prost = { version = "0.2.0", path = "../protoc-gen-prost" }
 regex = { version = "1.5.5", default-features = false }

diff --git a/protoc-gen-prost/Cargo.toml b/protoc-gen-prost/Cargo.toml
@@ -12,17 +12,15 @@ rust-version = "1.62"
 readme = "README.md"
 keywords = ["protobuf", "serialization", "prost"]
 categories = ["encoding"]
-exclude = [
-    "proto"
-]
+exclude = ["proto"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 once_cell = "1.10.0"
-prost-build = { version = ">=0.11.0, <0.11.2", default-features = false }
-prost-types = { version = "0.11.0", default-features = false }
-prost = { version = "0.11.0", default-features = false, features = ["std"] }
+prost-build = { version = "0.11.6", default-features = false }
+prost-types = { version = "0.11.6", default-features = false }
+prost = { version = "0.11.6", default-features = false, features = ["std"] }
 regex = { version = "1.5.5", default-features = false }
 
 [profile.release]

diff --git a/protoc-gen-prost/src/lib.rs b/protoc-gen-prost/src/lib.rs
@@ -219,6 +219,8 @@ struct ProstParameters {
     extern_path: Vec<(String, String)>,
     type_attribute: Vec<(String, String)>,
     field_attribute: Vec<(String, String)>,
+    enum_attribute: Vec<(String, String)>,
+    message_attribute: Vec<(String, String)>,
     compile_well_known_types: bool,
     retain_enum_prefix: bool,
 }
@@ -244,6 +246,12 @@ impl ProstParameters {
         for (proto_path, attribute) in &self.field_attribute {
             config.field_attribute(proto_path, attribute);
         }
+        for (proto_path, attribute) in &self.enum_attribute {
+            config.enum_attribute(proto_path, attribute);
+        }
+        for (proto_path, attribute) in &self.message_attribute {
+            config.message_attribute(proto_path, attribute);
+        }
 
         if self.compile_well_known_types {
             config.compile_well_known_types();
@@ -323,6 +331,22 @@ impl ProstParameters {
                 prefix.to_string(),
                 module.replace(r"\,", ",").replace(r"\\", r"\"),
             )),
+            Param::KeyValue {
+                param: "enum_attribute",
+                key: prefix,
+                value: module,
+            } => self.enum_attribute.push((
+                prefix.to_string(),
+                module.replace(r"\,", ",").replace(r"\\", r"\"),
+            )),
+            Param::KeyValue {
+                param: "message_attribute",
+                key: prefix,
+                value: module,
+            } => self.message_attribute.push((
+                prefix.to_string(),
+                module.replace(r"\,", ",").replace(r"\\", r"\"),
+            )),
             _ => return Err(param),
         }
 

diff --git a/protoc-gen-tonic/Cargo.toml b/protoc-gen-tonic/Cargo.toml
@@ -11,17 +11,15 @@ edition = "2021"
 readme = "README.md"
 keywords = ["protobuf", "serialization", "prost", "grpc", "tonic"]
 categories = ["encoding"]
-exclude = [
-    "proto"
-]
+exclude = ["proto"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 heck = "0.4.0"
 prettyplease = "0.1.9"
-prost-build = { version = ">=0.11.0, <0.11.2", default-features = false }
-prost-types = { version = "0.11.0", default-features = false }
+prost-build = { version = "0.11.6", default-features = false }
+prost-types = { version = "0.11.6", default-features = false }
 prost = { version = "0.11.0", default-features = false, features = ["std"] }
 protoc-gen-prost = { version = "0.2.0", path = "../protoc-gen-prost" }
 regex = { version = "1.5.5", default-features = false }