format

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -5135,9 +5135,9 @@ std::string Converter::ConvertIRFragment(
           ConvertMappedMethodCall(expr, **mc, bindings, args, num_args, ctx);
     } else if (auto *re =
                    std::get_if<std::unique_ptr<RefExprFragment>>(&frag)) {
-      result += (*re)->prefix + ' ' +
-                ConvertIRFragment((*re)->inner, bindings, expr, args, num_args,
-                                  ctx);
+      result +=
+          (*re)->prefix + ' ' +
+          ConvertIRFragment((*re)->inner, bindings, expr, args, num_args, ctx);
     }
   }
 

cpp2rust/converter/converter.h

@@ -94,12 +94,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual std::string GetUnboxedDefaultAsString(clang::QualType qual_type);
 
-  std::string
-  ConvertIRFragment(const std::vector<TranslationRule::BodyFragment> &fragments,
-                    llvm::ArrayRef<clang::TemplateArgument> bindings,
-                    clang::Expr *expr, clang::Expr **args, unsigned num_args,
-                    TempMaterializationCtx *ctx);
-
   std::string GetTemplateArgumentAsString(const clang::TemplateArgument &arg);
 
   bool VisitRecoveryExpr(clang::RecoveryExpr *expr);
@@ -304,6 +298,12 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     std::vector<std::string> materialized_refs_;
   };
 
+  std::string
+  ConvertIRFragment(const std::vector<TranslationRule::BodyFragment> &fragments,
+                    llvm::ArrayRef<clang::TemplateArgument> bindings,
+                    clang::Expr *expr, clang::Expr **args, unsigned num_args,
+                    TempMaterializationCtx *ctx);
+
   struct PlaceholderCtx {
     unsigned arg_idx;
     std::optional<clang::QualType> implicit_convert_to;

cpp2rust/converter/models/converter_refcount.cpp

@@ -2996,10 +2996,9 @@ std::string ConverterRefCount::ConvertMappedMethodCall(
   auto param_type = Mapper::GetParamType(*this, expr, arg_idx);
 
   if (arg->getType()->isPointerType()) {
-    return std::format("{}.with_mut(|__v: {}| __v{})", ConvertPointer(arg),
-                       param_type,
-                       ConvertIRFragment(mc.body, bindings, expr, args,
-                                         num_args, ctx));
+    return std::format(
+        "{}.with_mut(|__v: {}| __v{})", ConvertPointer(arg), param_type,
+        ConvertIRFragment(mc.body, bindings, expr, args, num_args, ctx));
   }
 
   // A receiver reached through a pointer is modified through it, only for
@@ -3016,8 +3015,7 @@ std::string ConverterRefCount::ConvertMappedMethodCall(
   }
 
   auto ptr = pending_deref_.take();
-  auto body =
-      ConvertIRFragment(mc.body, bindings, expr, args, num_args, ctx);
+  auto body = ConvertIRFragment(mc.body, bindings, expr, args, num_args, ctx);
   MarkFresh();
 
   return std::format("{}.with_mut(|__v: {}| __v{})", ptr, param_type, body);

cpp2rust/converter/models/converter_refcount.h

@@ -321,12 +321,10 @@ class ConverterRefCount final : public Converter {
   // converted.
   bool in_receiver_ = false;
 
-  std::string
-  ConvertMappedMethodCall(clang::Expr *expr,
-                          const TranslationRule::MethodCallFragment &mc,
-                          llvm::ArrayRef<clang::TemplateArgument> bindings,
-                          clang::Expr **args, unsigned num_args,
-                          TempMaterializationCtx *ctx) override;
+  std::string ConvertMappedMethodCall(
+      clang::Expr *expr, const TranslationRule::MethodCallFragment &mc,
+      llvm::ArrayRef<clang::TemplateArgument> bindings, clang::Expr **args,
+      unsigned num_args, TempMaterializationCtx *ctx) override;
 
 private:
   void SetUFCSReceiver(clang::Expr *base, bool is_arrow,