revert breaking changes and add default

tokio-rs · Dec 19, 2022 · e1653f5 · e1653f5
1 parent ed3dac9
commit e1653f5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/prost-build/src/ast.rs b/prost-build/src/ast.rs
@@ -5,7 +5,7 @@ use pulldown_cmark::{CodeBlockKind, Event, Options, Parser, Tag};
 use regex::Regex;
 
 /// Comments on a Protobuf item.
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 pub struct Comments {
     /// Leading detached blocks of comments.
     pub leading_detached: Vec<Vec<String>>,
@@ -134,7 +134,7 @@ pub struct Service {
     /// The package name as it appears in the .proto file.
     pub package: String,
     /// The service comments.
-    pub comments: Option<Comments>,
+    pub comments: Comments,
     /// The service methods.
     pub methods: Vec<Method>,
     /// The service options.
@@ -149,7 +149,7 @@ pub struct Method {
     /// The name of the method as it appears in the .proto file.
     pub proto_name: String,
     /// The method comments.
-    pub comments: Option<Comments>,
+    pub comments: Comments,
     /// The input Rust type.
     pub input_type: String,
     /// The output Rust type.

diff --git a/prost-build/src/code_generator.rs b/prost-build/src/code_generator.rs
@@ -741,7 +741,10 @@ impl<'a> CodeGenerator<'a> {
         let name = service.name().to_owned();
         debug!("  service: {:?}", name);
 
-        let comments = self.location().map(Comments::from_location);
+        let comments = self
+            .location()
+            .map(Comments::from_location)
+            .unwrap_or_default();
 
         self.path.push(2);
         let methods = service
@@ -752,7 +755,10 @@ impl<'a> CodeGenerator<'a> {
                 debug!("  method: {:?}", method.name());
 
                 self.path.push(idx as i32);
-                let comments = self.location().map(Comments::from_location);
+                let comments = self
+                    .location()
+                    .map(Comments::from_location)
+                    .unwrap_or_default();
                 self.path.pop();
 
                 let name = method.name.take().unwrap();

diff --git a/prost-build/src/lib.rs b/prost-build/src/lib.rs
@@ -1332,16 +1332,12 @@ mod tests {
     impl ServiceGenerator for ServiceTraitGenerator {
         fn generate(&mut self, service: Service, buf: &mut String) {
             // Generate a trait for the service.
-            if let Some(comments) = service.comments {
-                comments.append_with_indent(0, buf);
-            }
+            service.comments.append_with_indent(0, buf);
             buf.push_str(&format!("trait {} {{\n", &service.name));
 
             // Generate the service methods.
             for method in service.methods {
-                if let Some(comments) = method.comments {
-                    comments.append_with_indent(1, buf);
-                }
+                method.comments.append_with_indent(1, buf);
                 buf.push_str(&format!(
                     "    fn {}(_: {}) -> {};\n",
                     method.name, method.input_type, method.output_type