Skip to content

Commit 2dd86b1

Browse files
tnineslingclaude
andauthored
Fix collapsible_if clippy warnings with edition 2024 let-chains
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent fd7a127 commit 2dd86b1

1 file changed

Lines changed: 9 additions & 13 deletions

File tree

  • apollo-federation/src/query_plan/incremental_planner/field_routing

‎apollo-federation/src/query_plan/incremental_planner/field_routing/commit.rs‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -226,10 +226,8 @@ impl FieldRoutingSearchSpace {
226226
// Keys the current fetch cannot resolve directly are routed as
227227
// pending selections; ordering edges to the new group are wired as
228228
// they commit.
229-
if !key_locally_resolvable {
230-
if let Some(key_conditions) = &choice.key_conditions {
231-
self.push_condition_pendings(state, pending, key_conditions, new_group)?;
232-
}
229+
if !key_locally_resolvable && let Some(key_conditions) = &choice.key_conditions {
230+
self.push_condition_pendings(state, pending, key_conditions, new_group)?;
233231
}
234232

235233
// Multi-hop key chain: walk through intermediate subgraphs,
@@ -365,14 +363,13 @@ impl FieldRoutingSearchSpace {
365363
dedupe_same_type_key: bool,
366364
) -> EdgeIndex {
367365
if let Some(existing_edge) = state.graph.find_edge(anchor, group) {
368-
if let Some(input) = key_input {
369-
if !(dedupe_same_type_key
366+
if let Some(input) = key_input
367+
&& !(dedupe_same_type_key
370368
&& state
371369
.graph
372370
.edge_has_key_input(existing_edge, &input.source_type_name))
373-
{
374-
state.graph.add_input_to_edge(existing_edge, input);
375-
}
371+
{
372+
state.graph.add_input_to_edge(existing_edge, input);
376373
}
377374
existing_edge
378375
} else {
@@ -635,11 +632,10 @@ impl FieldRoutingSearchSpace {
635632
let target_data = self.query_graph.node_weight(target_qg_node)?;
636633
if let Ok(target_pos) =
637634
CompositeTypeDefinitionPosition::try_from(target_data.type_.clone())
635+
&& target_pos.is_abstract_type()
638636
{
639-
if target_pos.is_abstract_type() {
640-
let target_source = self.node_source(target_qg_node)?;
641-
self.append_typename(state, fetch_node, op_path, &target_source);
642-
}
637+
let target_source = self.node_source(target_qg_node)?;
638+
self.append_typename(state, fetch_node, op_path, &target_source);
643639
}
644640
}
645641
Ok(())

0 commit comments

Comments
 (0)