Skip to content

Commit 7999981

Browse files
author
daniel.eades
committed
flip unnecessary booleans (clippy::if_not_else)
1 parent f41aa04 commit 7999981

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

graphql_client_cli/src/generate.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ pub(crate) fn generate_code(params: CliCodegenParams) -> CliResult<()> {
8181
.map_err(|err| Error::message(format!("Error generating module code: {err}")))?;
8282

8383
let generated_code = format!("{WARNING_SUPPRESSION}\n{gen}");
84-
let generated_code = if !no_formatting {
85-
format(&generated_code)?
86-
} else {
84+
let generated_code = if no_formatting {
8785
generated_code
86+
} else {
87+
format(&generated_code)?
8888
};
8989

9090
let query_file_name: OsString =

graphql_client_codegen/src/codegen.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,10 @@ fn generate_variable_struct_field(
147147
let ident = Ident::new(&safe_name, Span::call_site());
148148
let rename_annotation = shared::field_rename_annotation(&variable.name, &safe_name);
149149
let skip_serializing_annotation = if *options.skip_serializing_none() {
150-
if variable.r#type.qualifiers.first() != Some(&GraphqlTypeQualifier::Required) {
151-
Some(quote!(#[serde(skip_serializing_if = "Option::is_none")]))
152-
} else {
150+
if variable.r#type.qualifiers.first() == Some(&GraphqlTypeQualifier::Required) {
153151
None
152+
} else {
153+
Some(quote!(#[serde(skip_serializing_if = "Option::is_none")]))
154154
}
155155
} else {
156156
None

graphql_client_codegen/src/codegen/selection.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,9 @@ impl<'a> ExpandedSelection<'a> {
592592
continue;
593593
}
594594

595-
let (on_field, on_enum) = if !on_variants.is_empty() {
595+
let (on_field, on_enum) = if on_variants.is_empty() {
596+
(None, None)
597+
} else {
596598
let enum_name = Ident::new(&format!("{}On", ty.name), Span::call_site());
597599

598600
let on_field = quote!(#[serde(flatten)] pub on: #enum_name);
@@ -606,8 +608,6 @@ impl<'a> ExpandedSelection<'a> {
606608
);
607609

608610
(Some(on_field), Some(on_enum))
609-
} else {
610-
(None, None)
611611
};
612612

613613
let tokens = quote! {

graphql_client_codegen/src/codegen/shared.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ pub(crate) fn keyword_replace<'a>(needle: impl Into<Cow<'a, str>>) -> Cow<'a, st
2424
/// the equivalent rust name, produces a serde annotation to map them during
2525
/// (de)serialization if it is necessary, otherwise an empty TokenStream.
2626
pub(crate) fn field_rename_annotation(graphql_name: &str, rust_name: &str) -> Option<TokenStream> {
27-
if graphql_name != rust_name {
28-
Some(quote!(#[serde(rename = #graphql_name)]))
29-
} else {
27+
if graphql_name == rust_name {
3028
None
29+
} else {
30+
Some(quote!(#[serde(rename = #graphql_name)]))
3131
}
3232
}
3333

0 commit comments

Comments
 (0)