Fix merge artifacts

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1618,7 +1618,7 @@ Converter::CallInfo Converter::CollectCallInfo(clang::CallExpr *expr) {
   const auto *function = decl ? decl->getAsFunction() : nullptr;
   const clang::FunctionProtoType *proto = nullptr;
   if (!function) {
-    auto callee_ty = info.callee->getType().getDesugaredType(ctx_);
+    auto callee_ty = callee->getType().getDesugaredType(ctx_);
     if (auto ptr_ty = callee_ty->getAs<clang::PointerType>()) {
       proto = ptr_ty->getPointeeType()->getAs<clang::FunctionProtoType>();
     }
@@ -1651,10 +1651,6 @@ Converter::CallInfo Converter::CollectCallInfo(clang::CallExpr *expr) {
         .kind = info.is_libc_passthrough ? Kind::Inline : Kind::Hoisted,
     };
     bool is_materialize = clang::isa<clang::MaterializeTemporaryExpr>(arg);
-    if (is_materialize && ca.param_type->isLValueReferenceType()) {
-      ca.kind = Kind::Materialized;
-    };
-    bool is_materialize = clang::isa<clang::MaterializeTemporaryExpr>(arg);
     if (is_materialize && ca.param_type->isLValueReferenceType()) {
       ca.kind = Kind::Materialized;
     } else if (is_materialize) {
@@ -1755,10 +1751,6 @@ void Converter::EmitArgList(const CallInfo &info) {
   }
 }
 
-void Converter::EmitCall(CallInfo &&info) {
-  EmitHoistedArgs(info);
-}
-
 void Converter::EmitCall(CallInfo &&info) {
   EmitHoistedArgs(info);
 

cpp2rust/converter/converter.h

@@ -252,12 +252,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   void ConvertParamTy(clang::QualType param_type, clang::Expr *expr);
 
-  };
-
-  CallInfo CollectCallInfo(clang::CallExpr *expr);
-
-  void ConvertParamTy(clang::QualType param_type, clang::Expr *expr);
-
   void EmitHoistedArgs(CallInfo &info);
 
   void EmitArgList(const CallInfo &info);