Skip to content

Commit 90840e8

Browse files
committed
format
1 parent c640373 commit 90840e8

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

‎cpp2rust/converter/converter.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1884,8 +1884,7 @@ bool Converter::VisitCallExpr(clang::CallExpr *expr) {
18841884
return false;
18851885
}
18861886

1887-
if (IsImplicitAssignmentCall(expr) &&
1888-
!Mapper::Contains(ctx_, expr)) {
1887+
if (IsImplicitAssignmentCall(expr) && !Mapper::Contains(ctx_, expr)) {
18891888
auto *call = clang::cast<clang::CXXMemberCallExpr>(expr);
18901889
ConvertAssignment(call->getImplicitObjectArgument(), call->getArg(0), "=");
18911890
return false;
@@ -2057,8 +2056,7 @@ Converter::CallInfo Converter::CollectCallInfo(clang::CallExpr *expr) {
20572056
function ? function->getNumParams() : proto->getNumParams();
20582057
info.is_variadic = function ? function->isVariadic() : proto->isVariadic();
20592058
info.is_fn_ptr_call = !function || AsLambdaClass(callee->getType());
2060-
info.is_libc_passthrough =
2061-
RuleRegistry::IsLibcPassthrough(ctx_, expr);
2059+
info.is_libc_passthrough = RuleRegistry::IsLibcPassthrough(ctx_, expr);
20622060

20632061
for (unsigned i = 0; i < num_named_params && i < num_args; ++i) {
20642062
auto *arg = expr->getArg(i + arg_begin);

‎cpp2rust/converter/models/boxed_vars.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class AddressTakenVisitor
196196
// The arguments of a call translated by a rule are passed by value or
197197
// borrowed, unless the rule takes a pointer to them.
198198
void AddRuleArgs(clang::Expr *expr, clang::Expr **args, unsigned num_args) {
199-
auto *rule = RuleRegistry::GetExprRule(ctx_, GetCalleeOrExpr(expr));
199+
auto *rule = RuleRegistry::GetExprRule(ctx_, expr);
200200
if (!rule) {
201201
return;
202202
}

‎cpp2rust/converter/models/converter_refcount.cpp‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,8 +1329,7 @@ bool ConverterRefCount::VisitCallExpr(clang::CallExpr *expr) {
13291329
}
13301330

13311331
if (auto *opcall = clang::dyn_cast<clang::CXXOperatorCallExpr>(expr);
1332-
opcall && !IsUserOperatorCall(opcall) &&
1333-
!Mapper::Contains(ctx_, expr)) {
1332+
opcall && !IsUserOperatorCall(opcall) && !Mapper::Contains(ctx_, expr)) {
13341333
PushConversionKind push(*this, ConversionKind::Unboxed,
13351334
opcall->getOperator() == clang::OO_Call);
13361335
return ConvertCXXOperatorCallExpr(opcall);
@@ -2268,9 +2267,9 @@ bool ConverterRefCount::VisitCXXForRangeStmtMap(clang::CXXForRangeStmt *stmt) {
22682267
ConvertObject(stmt->getRangeInit()), ')');
22692268
PushBrace brace(*this);
22702269

2271-
EmitByValueShadow(loop_var, std::string(loop_var_name),
2272-
"Value<" +
2273-
Mapper::Map(*this, GetForRangeIteratorType(stmt)) + '>');
2270+
EmitByValueShadow(
2271+
loop_var, std::string(loop_var_name),
2272+
"Value<" + Mapper::Map(*this, GetForRangeIteratorType(stmt)) + '>');
22742273

22752274
ConvertForRangeBody(stmt, loop_var);
22762275

0 commit comments

Comments
 (0)