fix

Author: nunoplopes

cpp2rust/converter/converter.cpp

@@ -60,8 +60,7 @@ use std::rc::Rc;
 )");
 }
 
-std::string Converter::EmitMethodsOnPtr() {
-  std::string out;
+void Converter::EmitMethodsOnPtr(std::string &out) {
   for (const auto &[name, methods] : methods_on_ptr_) {
     out += methods.trait_header;
     out += " {\n";
@@ -72,35 +71,30 @@ std::string Converter::EmitMethodsOnPtr() {
     out += methods.impl_body;
     out += "}\n";
   }
-  return out;
 }
 
 std::string Converter::ForceGlobalInit(const clang::VarDecl *decl) {
   return std::format("std::cell::LazyCell::force(&*&raw const {});",
                      GetNamedDeclAsString(decl));
 }
 
-std::string Converter::EmitGlobalInits(Model model) {
-  std::string out = model == Model::kUnsafe
-                        ? "pub unsafe fn __cpp2rust_init_globals() {\n"
-                        : "pub fn __cpp2rust_init_globals() {\n";
+void Converter::EmitGlobalInits(Model model, string &out) {
+  out += model == Model::kUnsafe ? "pub unsafe fn __cpp2rust_init_globals() {\n"
+                                 : "pub fn __cpp2rust_init_globals() {\n";
   for (const auto &line : global_inits_) {
     out += line;
     out += '\n';
   }
   out += "}\n";
-  return out;
 }
 
-std::string Converter::EmitOpaqueRecords() {
-  std::string out;
+void Converter::EmitOpaqueRecords(std::string &out) {
   record_decls_.ForEachUndefined([&](const std::string &name) {
     out += "#[derive(Clone, Copy, Default, ByteRepr)]";
     out += "pub struct ";
     out += name;
     out += ";\n";
   });
-  return out;
 }
 
 bool Converter::VisitRecoveryExpr(clang::RecoveryExpr *expr) {

cpp2rust/converter/converter.h

@@ -52,10 +52,10 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void EmitFilePreamble();
 
-  static std::string EmitOpaqueRecords();
-  static std::string EmitGlobalInits(Model model);
+  static void EmitOpaqueRecords(std::string &out);
+  static void EmitGlobalInits(Model model, std::string &out);
 
-  static std::string EmitMethodsOnPtr();
+  static void EmitMethodsOnPtr(std::string &out);
 
   virtual bool VisitBuiltinType(clang::BuiltinType *type);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -2449,7 +2449,8 @@ void ConverterRefCount::ConvertPointerSubscript(
 }
 
 std::string ConverterRefCount::ForceGlobalInit(const clang::VarDecl *decl) {
-  return std::format("let _ = {}.with(|_| ());", GetNamedDeclAsString(decl), clone);
+  return std::format("let _ = {}.with(|_| ());", GetNamedDeclAsString(decl),
+                     clone);
 }
 
 void ConverterRefCount::ConvertFunctionMain(

cpp2rust/cpp2rust_lib.cpp

@@ -30,9 +30,9 @@ std::string TranspileSrc(std::string_view cc_code, Model model,
                                        rules_dir),
       cc_code, tool_args, std::filesystem::path(filename).filename().string(),
       filename.ends_with(".c") ? CLANG_C_COMPILER : CLANG_CXX_COMPILER);
-  rs_code += Converter::EmitOpaqueRecords();
-  rs_code += Converter::EmitMethodsOnPtr();
-  rs_code += Converter::EmitGlobalInits(model);
+  Converter::EmitOpaqueRecords(rs_code);
+  Converter::EmitMethodsOnPtr(rs_code);
+  Converter::EmitGlobalInits(model, rs_code);
   return rs_code;
 }
 
@@ -72,9 +72,9 @@ std::string TranspileDir(std::string_view build_dir, Model model,
   std::string rs_code;
   FrontendActionFactory factory(rs_code, model, rules_dir);
   Tool.run(&factory);
-  rs_code += Converter::EmitOpaqueRecords();
-  rs_code += Converter::EmitMethodsOnPtr();
-  rs_code += Converter::EmitGlobalInits(model);
+  Converter::EmitOpaqueRecords(rs_code);
+  Converter::EmitMethodsOnPtr(rs_code);
+  Converter::EmitGlobalInits(model, rs_code);
   return rs_code;
 }
 } // namespace cpp2rust