Rename arguments to and from

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1584,22 +1584,22 @@ bool Converter::Convert(clang::Expr *expr,
 }
 
 std::string Converter::ConvertPointeeCast(std::string str,
-                                          clang::QualType pointee,
-                                          clang::QualType slot) {
-  if (slot->isFunctionPointerType()) {
+                                          clang::QualType from,
+                                          clang::QualType to) {
+  if (to->isFunctionPointerType()) {
     return std::format("std::mem::transmute::<{}, {}>({})",
-                       ToString(ctx_.getPointerType(pointee)), ToString(slot),
+                       ToString(ctx_.getPointerType(from)), ToString(to),
                        str);
   }
-  auto target = GetUnsafeTypeAsString(slot->getPointeeType());
-  if (slot->isReferenceType() && !isAddrOf()) {
+  auto target = GetUnsafeTypeAsString(to->getPointeeType());
+  if (to->isReferenceType() && !isAddrOf()) {
     return std::format("*(&raw {} {}).cast::<{}>()",
-                       pointee.isConstQualified() ? "const" : "mut", str,
+                       from.isConstQualified() ? "const" : "mut", str,
                        target);
   }
   computed_expr_type_ = ComputedExprType::FreshPointer;
   return std::format("({} as {}).cast::<{}>()", str,
-                     GetUnsafeTypeAsString(ctx_.getPointerType(pointee)),
+                     GetUnsafeTypeAsString(ctx_.getPointerType(from)),
                      target);
 }
 

cpp2rust/converter/converter.h

@@ -313,8 +313,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
                                        clang::Expr *expr);
 
   virtual std::string ConvertPointeeCast(std::string str,
-                                         clang::QualType pointee,
-                                         clang::QualType slot);
+                                         clang::QualType from,
+                                         clang::QualType to);
 
   void ConvertFunctionPointerTransmute(clang::Expr *expr, clang::QualType type);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -409,19 +409,19 @@ std::string ConverterRefCount::ConvertFreshPointer(
 
 std::string ConverterRefCount::ConvertPointeeCast(std::string str,
                                                   clang::QualType,
-                                                  clang::QualType slot) {
-  if (slot->isFunctionPointerType()) {
+                                                  clang::QualType to) {
+  if (to->isFunctionPointerType()) {
     computed_expr_type_ = ComputedExprType::FreshPointer;
     return std::format(
         "({}).cast::<{}>()", str,
         ConvertFunctionPointerType(
-            slot->getPointeeType()->getAs<clang::FunctionProtoType>()));
+            to->getPointeeType()->getAs<clang::FunctionProtoType>()));
   }
-  if (slot->isReferenceType() && !isAddrOf()) {
+  if (to->isReferenceType() && !isAddrOf()) {
     return str;
   }
   PushConversionKind push(*this, ConversionKind::Unboxed);
-  auto element = ctx_.getBaseElementType(slot->getPointeeType());
+  auto element = ctx_.getBaseElementType(to->getPointeeType());
   computed_expr_type_ = ComputedExprType::FreshPointer;
   return std::format("({}).reinterpret_cast::<{}>()", str,
                      ToString(element.getUnqualifiedType()));

cpp2rust/converter/models/converter_refcount.h

@@ -377,8 +377,8 @@ class ConverterRefCount final : public Converter {
 
   void ConvertParamTyConstCast(clang::QualType, clang::Expr *) override {}
 
-  std::string ConvertPointeeCast(std::string str, clang::QualType pointee,
-                                 clang::QualType slot) override;
+  std::string ConvertPointeeCast(std::string str, clang::QualType from,
+                                 clang::QualType to) override;
 
   std::string ConvertSubscriptIndex(clang::Expr *idx);