https://gcc.gnu.org/g:45d4f73b81dcd26df03e5e210a1f50803d1d4733
commit r15-8532-g45d4f73b81dcd26df03e5e210a1f50803d1d4733
Author: Pierre-Emmanuel Patry <pierre-emmanuel.pa...@embecosm.com>
Date: Tue Nov 19 17:24:59 2024 +0100
gccrs: 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 <pierre-emmanuel.pa...@embecosm.com>
Diff:
---
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 5a825fd11390..8244e8ae2ba4 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<Type>> (
- std::unique_ptr<Type> (ASTLoweringType::translate (stmt.get_type ())))
- : tl::nullopt;
- auto init_expression
- = stmt.has_init_expr ()
- ? tl::optional<std::unique_ptr<Expr>> (std::unique_ptr<HIR::Expr> (
- ASTLoweringExpr::translate (stmt.get_init_expr ())))
- : tl::nullopt;
+ tl::optional<std::unique_ptr<Type>> type = tl::nullopt;
+
+ if (stmt.has_type ())
+ type
+ = std::unique_ptr<Type> (ASTLoweringType::translate (stmt.get_type ()));
+
+ tl::optional<std::unique_ptr<HIR::Expr>> init_expression = tl::nullopt;
+
+ if (stmt.has_init_expr ())
+ init_expression = std::unique_ptr<HIR::Expr> (
+ ASTLoweringExpr::translate (stmt.get_init_expr ()));
auto crate_num = mappings.get_current_crate ();
Analysis::NodeMapping mapping (crate_num, stmt.get_node_id (),
