Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid generating unneeded #[serde(rename)] #134

Merged
merged 2 commits into from
Aug 31, 2020
Merged

Avoid generating unneeded #[serde(rename)] #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
403bade
Do not generate unneded #[serde(rename)]
swallez Aug 31, 2020
459bd45
Generated code produced by previous commit
swallez Aug 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Cargo.lock

.idea
*.iml
.vscode/
*.log
yaml_test_runner/yaml/
Expand Down
4 changes: 3 additions & 1 deletion .rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
28 changes: 20 additions & 8 deletions api_generator/src/generator/code_gen/request/request_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
});

Expand Down
101 changes: 12 additions & 89 deletions elasticsearch/src/generated/namespace_clients/async_search.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,18 +131,11 @@ impl<'a, 'b> AsyncSearchDelete<'a, 'b> {
#[serde_with::skip_serializing_none]
#[derive(Serialize)]
struct QueryParams<'b> {
#[serde(rename = "error_trace")]
error_trace: Option<bool>,
#[serde(
rename = "filter_path",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
filter_path: Option<&'b [&'b str]>,
#[serde(rename = "human")]
human: Option<bool>,
#[serde(rename = "pretty")]
pretty: Option<bool>,
#[serde(rename = "source")]
source: Option<&'b str>,
}
let query_params = QueryParams {
Expand Down Expand Up @@ -277,24 +270,14 @@ impl<'a, 'b> AsyncSearchGet<'a, 'b> {
#[serde_with::skip_serializing_none]
#[derive(Serialize)]
struct QueryParams<'b> {
#[serde(rename = "error_trace")]
error_trace: Option<bool>,
#[serde(
rename = "filter_path",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
filter_path: Option<&'b [&'b str]>,
#[serde(rename = "human")]
human: Option<bool>,
#[serde(rename = "keep_alive")]
keep_alive: Option<&'b str>,
#[serde(rename = "pretty")]
pretty: Option<bool>,
#[serde(rename = "source")]
source: Option<&'b str>,
#[serde(rename = "typed_keys")]
typed_keys: Option<bool>,
#[serde(rename = "wait_for_completion_timeout")]
wait_for_completion_timeout: Option<&'b str>,
}
let query_params = QueryParams {
Expand Down Expand Up @@ -768,121 +751,61 @@ where
#[serde_with::skip_serializing_none]
#[derive(Serialize)]
struct QueryParams<'b> {
#[serde(
rename = "_source",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
_source: Option<&'b [&'b str]>,
#[serde(
rename = "_source_excludes",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
_source_excludes: Option<&'b [&'b str]>,
#[serde(
rename = "_source_includes",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
_source_includes: Option<&'b [&'b str]>,
#[serde(rename = "allow_no_indices")]
allow_no_indices: Option<bool>,
#[serde(rename = "allow_partial_search_results")]
allow_partial_search_results: Option<bool>,
#[serde(rename = "analyze_wildcard")]
analyze_wildcard: Option<bool>,
#[serde(rename = "analyzer")]
analyzer: Option<&'b str>,
#[serde(rename = "batched_reduce_size")]
batched_reduce_size: Option<i64>,
#[serde(rename = "default_operator")]
default_operator: Option<DefaultOperator>,
#[serde(rename = "df")]
df: Option<&'b str>,
#[serde(
rename = "docvalue_fields",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
docvalue_fields: Option<&'b [&'b str]>,
#[serde(rename = "error_trace")]
error_trace: Option<bool>,
#[serde(
rename = "expand_wildcards",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
expand_wildcards: Option<&'b [ExpandWildcards]>,
#[serde(rename = "explain")]
explain: Option<bool>,
#[serde(
rename = "filter_path",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
filter_path: Option<&'b [&'b str]>,
#[serde(rename = "from")]
from: Option<i64>,
#[serde(rename = "human")]
human: Option<bool>,
#[serde(rename = "ignore_throttled")]
ignore_throttled: Option<bool>,
#[serde(rename = "ignore_unavailable")]
ignore_unavailable: Option<bool>,
#[serde(rename = "keep_alive")]
keep_alive: Option<&'b str>,
#[serde(rename = "keep_on_completion")]
keep_on_completion: Option<bool>,
#[serde(rename = "lenient")]
lenient: Option<bool>,
#[serde(rename = "max_concurrent_shard_requests")]
max_concurrent_shard_requests: Option<i64>,
#[serde(rename = "preference")]
preference: Option<&'b str>,
#[serde(rename = "pretty")]
pretty: Option<bool>,
#[serde(rename = "q")]
q: Option<&'b str>,
#[serde(rename = "request_cache")]
request_cache: Option<bool>,
#[serde(
rename = "routing",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
routing: Option<&'b [&'b str]>,
#[serde(rename = "search_type")]
search_type: Option<SearchType>,
#[serde(rename = "seq_no_primary_term")]
seq_no_primary_term: Option<bool>,
#[serde(rename = "size")]
size: Option<i64>,
#[serde(rename = "sort", serialize_with = "crate::client::serialize_coll_qs")]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
sort: Option<&'b [&'b str]>,
#[serde(rename = "source")]
source: Option<&'b str>,
#[serde(rename = "stats", serialize_with = "crate::client::serialize_coll_qs")]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
stats: Option<&'b [&'b str]>,
#[serde(
rename = "stored_fields",
serialize_with = "crate::client::serialize_coll_qs"
)]
#[serde(serialize_with = "crate::client::serialize_coll_qs")]
stored_fields: Option<&'b [&'b str]>,
#[serde(rename = "suggest_field")]
suggest_field: Option<&'b str>,
#[serde(rename = "suggest_mode")]
suggest_mode: Option<SuggestMode>,
#[serde(rename = "suggest_size")]
suggest_size: Option<i64>,
#[serde(rename = "suggest_text")]
suggest_text: Option<&'b str>,
#[serde(rename = "terminate_after")]
terminate_after: Option<i64>,
#[serde(rename = "timeout")]
timeout: Option<&'b str>,
#[serde(rename = "track_scores")]
track_scores: Option<bool>,
#[serde(rename = "track_total_hits")]
track_total_hits: Option<TrackTotalHits>,
#[serde(rename = "typed_keys")]
typed_keys: Option<bool>,
#[serde(rename = "version")]
version: Option<bool>,
#[serde(rename = "wait_for_completion_timeout")]
wait_for_completion_timeout: Option<&'b str>,
}
let query_params = QueryParams {
Expand Down
Loading