From 78d567802b3c30e9498fc710f71d108a7a74fab7 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Tue, 19 Nov 2024 17:24:59 +0100 Subject: [PATCH] Refactor optional initializers Refactor some optional initializer in the lowering stage to make them more readable. gcc/rust/ChangeLog: * hir/rust-ast-lower-stmt.cc (ASTLoweringStmt::visit): Change the ternary expression with a more readable if. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/hir/rust-ast-lower-stmt.cc | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/gcc/rust/hir/rust-ast-lower-stmt.cc b/gcc/rust/hir/rust-ast-lower-stmt.cc index 07283941328f..29da916cefc4 100644 --- a/gcc/rust/hir/rust-ast-lower-stmt.cc +++ b/gcc/rust/hir/rust-ast-lower-stmt.cc @@ -70,15 +70,17 @@ ASTLoweringStmt::visit (AST::LetStmt &stmt) HIR::Pattern *variables = ASTLoweringPattern::translate (stmt.get_pattern (), true); - auto type - = stmt.has_type () ? tl::optional> ( - std::unique_ptr (ASTLoweringType::translate (stmt.get_type ()))) - : tl::nullopt; - auto init_expression - = stmt.has_init_expr () - ? tl::optional> (std::unique_ptr ( - ASTLoweringExpr::translate (stmt.get_init_expr ()))) - : tl::nullopt; + tl::optional> type = tl::nullopt; + + if (stmt.has_type ()) + type + = std::unique_ptr (ASTLoweringType::translate (stmt.get_type ())); + + tl::optional> init_expression = tl::nullopt; + + if (stmt.has_init_expr ()) + init_expression = std::unique_ptr ( + ASTLoweringExpr::translate (stmt.get_init_expr ())); auto crate_num = mappings.get_current_crate (); Analysis::NodeMapping mapping (crate_num, stmt.get_node_id (),