Refactor return statements

P-E-P · P-E-P · commit 0c8add3103dc · 2025-08-22T12:47:56.000Z
gcc/rust/ChangeLog:

	* typecheck/rust-coercion.cc (TypeCoercionRules::do_coercion): Refactor
	common return statement.

Signed-off-by: Pierre-Emmanuel Patry &lt;pierre-emmanuel.patry@embecosm.com&gt;
diff --git a/gcc/rust/typecheck/rust-coercion.cc b/gcc/rust/typecheck/rust-coercion.cc
@@ -78,7 +78,6 @@ TypeCoercionRules::do_coercion (TyTy::BaseType *receiver)
 	  TyTy::TyVar implicit_var
 	    = TyTy::TyVar::get_implicit_infer_var (locus);
 	  try_result = CoercionResult{{}, implicit_var.get_tyty ()};
-	  return true;
 	}
       else
 	{
@@ -99,9 +98,8 @@ TypeCoercionRules::do_coercion (TyTy::BaseType *receiver)
 	    try_result = CoercionResult{{}, receiver};
 	  else
 	    try_result = CoercionResult{{}, expected->clone ()};
-
-	  return true;
 	}
+      return true;
     }
 
   // unsize

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,6 @@ TypeCoercionRules::do_coercion (TyTy::BaseType *receiver)`
`78`	`78`	`TyTy::TyVar implicit_var`
`79`	`79`	`= TyTy::TyVar::get_implicit_infer_var (locus);`
`80`	`80`	`try_result = CoercionResult{{}, implicit_var.get_tyty ()};`
`81`		`- return true;`
`82`	`81`	`}`
`83`	`82`	`else`
`84`	`83`	`{`
`@@ -99,9 +98,8 @@ TypeCoercionRules::do_coercion (TyTy::BaseType *receiver)`
`99`	`98`	`try_result = CoercionResult{{}, receiver};`
`100`	`99`	`else`
`101`	`100`	`try_result = CoercionResult{{}, expected->clone ()};`
`102`		`-`
`103`		`- return true;`
`104`	`101`	`}`
	`102`	`+ return true;`
`105`	`103`	`}`
`106`	`104`
`107`	`105`	`// unsize`