Merge pull request #12 from golemcloud/lib-improvements-3

Lib improvements 3

Author: vigoo

src/lib.rs

@@ -67,6 +67,7 @@ pub fn gen(
     name: &str,
     version: &str,
     overwrite_cargo: bool,
+    disable_clippy: bool,
 ) -> Result<()> {
     let open_api = merge_all_openapi_specs(openapi_specs)?;
 
@@ -125,13 +126,13 @@ pub fn gen(
 
     std::fs::write(
         src.join("api.rs"),
-        rust::lib_gen::lib_gen("crate::api", &api_module_defs),
+        rust::lib_gen::lib_gen("crate::api", &api_module_defs, disable_clippy),
     )
     .unwrap();
 
     std::fs::write(
         src.join("model.rs"),
-        rust::lib_gen::lib_gen("crate::model", &models),
+        rust::lib_gen::lib_gen("crate::model", &models, disable_clippy),
     )
     .unwrap();
 
@@ -145,7 +146,7 @@ pub fn gen(
         errors.def,
     ];
 
-    let lib = rust::lib_gen::lib_gen("crate", &module_defs);
+    let lib = rust::lib_gen::lib_gen("crate", &module_defs, disable_clippy);
     std::fs::write(src.join("lib.rs"), lib).unwrap();
 
     if overwrite_cargo {

src/main.rs

@@ -63,6 +63,7 @@ fn main() {
                 &args.name,
                 &args.client_version,
                 true,
+                false,
             )
             .unwrap();
         }

src/rust/lib_gen.rs

@@ -92,7 +92,7 @@ impl ModuleDef {
     }
 }
 
-pub fn lib_gen(self_name: &str, modules: &[ModuleDef]) -> String {
+pub fn lib_gen(self_name: &str, modules: &[ModuleDef], disable_clippy: bool) -> String {
     let mods = modules
         .iter()
         .map(|m| &m.name)
@@ -108,7 +108,12 @@ pub fn lib_gen(self_name: &str, modules: &[ModuleDef]) -> String {
         .reduce(|acc, e| acc + e)
         .unwrap_or_else(unit);
 
-    let code = line(unit() + "#![allow(clippy::all)]") + NewLine + mods + NewLine + uses;
+    let base = if disable_clippy {
+        line(unit() + "#[allow(clippy::all)]")
+    } else {
+        unit()
+    };
+    let code = base + NewLine + mods + NewLine + uses;
 
     RustContext::new().print_to_string(code)
 }
@@ -133,10 +138,11 @@ mod tests {
                     exports: vec!["A".to_string(), "Y".to_string()],
                 },
             ],
+            true,
         );
 
         let expected = indoc! { r#"
-            #![allow(clippy::all)]
+            #[allow(clippy::all)]
 
             mod abc;
             mod xyz;