Merge branch 'enum_attr_fix' of https://github.com/Luro02/codegen into Luro02-enum_attr_fix

Author: Filippo Costa

src/type_def.rs

@@ -13,7 +13,7 @@ pub struct TypeDef {
     vis: Option<String>,
     docs: Option<Docs>,
     derive: Vec<String>,
-    allow: Option<String>,
+    allow: Vec<String>,
     repr: Option<String>,
     bounds: Vec<Bound>,
     macros: Vec<String>,
@@ -27,7 +27,7 @@ impl TypeDef {
             vis: None,
             docs: None,
             derive: vec![],
-            allow: None,
+            allow: vec![],
             repr: None,
             bounds: vec![],
             macros: vec![],
@@ -61,7 +61,7 @@ impl TypeDef {
     }
 
     pub fn allow(&mut self, allow: &str) {
-        self.allow = Some(allow.to_string());
+        self.allow.push(allow.to_string());
     }
 
     pub fn repr(&mut self, repr: &str) {
@@ -107,8 +107,8 @@ impl TypeDef {
         Ok(())
     }
 
-    fn fmt_allow(&self, fmt: &mut Formatter<'_>) -> fmt::Result {
-        if let Some(ref allow) = self.allow {
+    fn fmt_allow(&self, fmt: &mut Formatter) -> fmt::Result {
+        for allow in &self.allow {
             write!(fmt, "#[allow({})]\n", allow)?;
         }
 

tests/codegen.rs

@@ -561,3 +561,47 @@ impl Foo for Bar {
 
     assert_eq!(scope.to_string(), &expect[1..]);
 }
+
+#[test]
+fn struct_with_multiple_allow() {
+    let mut scope = Scope::new();
+
+    scope
+        .new_struct("Foo")
+        .allow("dead_code")
+        .allow("clippy::all")
+        .field("one", "u8")
+        .field("two", "u8");
+
+    let expect = r#"
+#[allow(dead_code)]
+#[allow(clippy::all)]
+struct Foo {
+    one: u8,
+    two: u8,
+}"#;
+
+    assert_eq!(scope.to_string(), &expect[1..]);
+}
+
+#[test]
+fn enum_with_multiple_allow() {
+    let mut scope = Scope::new();
+
+    scope
+        .new_enum("IpAddrKind")
+        .allow("dead_code")
+        .allow("clippy::all")
+        .push_variant(Variant::new("V4"))
+        .push_variant(Variant::new("V6"));
+
+    let expect = r#"
+#[allow(dead_code)]
+#[allow(clippy::all)]
+enum IpAddrKind {
+    V4,
+    V6,
+}"#;
+
+    assert_eq!(scope.to_string(), &expect[1..]);
+}