Do not generate unneded #[serde(rename)]

Avoid generating #[serde(rename)] for fields that have not been renamed.

Drive-by changes:
- add IntelliJ iml files to .gitignore
- comment out rustfmt attributes that aren't stable yet

Author: swallez

.gitignore

@@ -3,6 +3,7 @@
 Cargo.lock
 
 .idea
+*.iml
 .vscode/
 *.log
 yaml_test_runner/yaml/

.rustfmt.toml

@@ -1 +1,3 @@
-merge_imports = true
+# Available on rustfmt nightly currently so commented out so that we remember to enable it once stable
+#merge_imports = true
+#normalize_doc_attributes = true

api_generator/src/generator/code_gen/request/request_builder.rs

@@ -125,19 +125,31 @@ impl<'a> RequestBuilder<'a> {
             let query_struct_ty = ident("QueryParams");
             let struct_fields = endpoint_params.iter().map(|(param_name, param_type)| {
                 let field = Self::create_struct_field((param_name, param_type));
-                let field_rename = lit(param_name);
-                // TODO: we special case expand_wildcards here to be a list, but this should be fixed upstream
-                if param_type.ty == TypeKind::List || param_name == "expand_wildcards" {
-                    let serialize_with = lit("crate::client::serialize_coll_qs");
+
+                let renamed = field.ident.as_ref().unwrap() != param_name;
+                let serde_rename = if renamed {
+                    let field_rename = lit(param_name);
                     quote! {
-                        #[serde(rename = #field_rename, serialize_with = #serialize_with)]
-                        #field
+                        #[serde(rename = #field_rename)]
                     }
                 } else {
+                    quote!()
+                };
+
+                // TODO: we special case expand_wildcards here to be a list, but this should be fixed upstream
+                let expand = param_type.ty == TypeKind::List || param_name == "expand_wildcards";
+                let serialize_with = if expand {
                     quote! {
-                        #[serde(rename = #field_rename)]
-                        #field
+                        #[serde(serialize_with = "crate::client::serialize_coll_qs")]
                     }
+                } else {
+                    quote!()
+                };
+
+                quote! {
+                    #serde_rename
+                    #serialize_with
+                    #field
                 }
             });