Let Field.annotation be a Vec<String> instead of String for multi-line annotation

Author: nbigaouette

src/lib.rs

@@ -139,7 +139,7 @@ pub struct Field {
     documentation: String,
 
     /// Field annotation
-    annotation: String,
+    annotation: Vec<String>,
 }
 
 /// Defines an associated type.
@@ -1100,7 +1100,7 @@ impl Field {
             name: name.into(),
             ty: ty.into(),
             documentation: String::new(),
-            annotation: String::new(),
+            annotation: Vec::new(),
         }
     }
 
@@ -1111,8 +1111,8 @@ impl Field {
     }
 
     /// Set field's annotation.
-    pub fn annotation(&mut self, annotation: &str) -> &mut Self {
-        self.annotation = annotation.into();
+    pub fn annotation(&mut self, annotation: Vec<&str>) -> &mut Self {
+        self.annotation = annotation.iter().map(|ann| ann.to_string()).collect();
         self
     }
 }
@@ -1142,7 +1142,7 @@ impl Fields {
             name: name.to_string(),
             ty: ty.into(),
             documentation: String::new(),
-            annotation: String::new(),
+            annotation: Vec::new(),
         })
     }
 
@@ -1173,7 +1173,9 @@ impl Fields {
                             write!(fmt, "/// {}\n", f.documentation)?;
                         }
                         if !f.annotation.is_empty() {
-                            write!(fmt, "{}\n", f.annotation)?;
+                            for ann in &f.annotation {
+                                write!(fmt, "{}\n", ann)?;
+                            }
                         }
                         write!(fmt, "{}: ", f.name)?;
                         f.ty.fmt(fmt)?;
@@ -1251,7 +1253,7 @@ impl Impl {
             name: name.to_string(),
             ty: ty.into(),
             documentation: String::new(),
-            annotation: String::new(),
+            annotation: Vec::new(),
         });
 
         self
@@ -1400,7 +1402,7 @@ impl Function {
             // and `annotation` does not make sense for function arguments.
             // Simply use empty strings.
             documentation: String::new(),
-            annotation: String::new(),
+            annotation: Vec::new(),
         });
 
         self

tests/codegen.rs

@@ -47,7 +47,6 @@ fn single_struct_documented_field() {
     let mut scope = Scope::new();
 
     let doc = "Field's documentation";
-    let anot = r#"#[serde(rename = "bar")]"#;
 
     let mut struct_ = Struct::new("Foo");
 
@@ -56,11 +55,14 @@ fn single_struct_documented_field() {
     struct_.push_field(field1);
 
     let mut field2 = Field::new("two", "usize");
-    field2.annotation(anot);
+    field2.annotation(vec![r#"#[serde(rename = "bar")]"#]);
     struct_.push_field(field2);
 
     let mut field3 = Field::new("three", "usize");
-    field3.doc(doc).annotation(anot);
+    field3.doc(doc).annotation(vec![
+        r#"#[serde(skip_serializing)]"#,
+        r#"#[serde(skip_deserializing)]"#,
+    ]);
     struct_.push_field(field3);
 
     scope.push_struct(struct_);
@@ -72,7 +74,8 @@ struct Foo {
     #[serde(rename = "bar")]
     two: usize,
     /// Field's documentation
-    #[serde(rename = "bar")]
+    #[serde(skip_serializing)]
+    #[serde(skip_deserializing)]
     three: usize,
 }"#;