Do the same for copy/move assignment

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1095,6 +1095,10 @@ std::string Converter::GetMethodName(const clang::CXXMethodDecl *decl) {
   if (clang::isa<clang::CXXDestructorDecl>(decl)) {
     return kDestructorName;
   }
+  if (const char *name = GetCopyOrMoveName(decl);
+      name && CanUseCopyOrMoveName(decl, name)) {
+    return name;
+  }
   if (IsOverloadedMethod(decl)) {
     return GetOverloadedFunctionName(decl);
   }
@@ -1138,30 +1142,10 @@ std::string Converter::GetSelfMaybeWithMut(const clang::CXXMethodDecl *decl) {
   return MethodNeedsMutableReceiver(decl) ? "&mut self" : "&self";
 }
 
-static bool CanUseShortCopyOrMoveCtorName(clang::CXXConstructorDecl *decl,
-                                          const std::string &name) {
-  const auto *record = decl->getParent();
-  bool is_unique_ctor =
-      std::count_if(record->ctor_begin(), record->ctor_end(),
-                    [decl](const clang::CXXConstructorDecl *ctor) {
-                      return !ctor->isDeleted() &&
-                             (decl->isCopyConstructor()
-                                  ? ctor->isCopyConstructor()
-                                  : ctor->isMoveConstructor());
-                    }) == 1;
-  bool is_unique_name =
-      std::none_of(record->method_begin(), record->method_end(),
-                   [&name](const clang::CXXMethodDecl *method) {
-                     return method->getDeclName().isIdentifier() &&
-                            method->getName() == name;
-                   });
-  return is_unique_ctor && is_unique_name;
-}
-
 std::string Converter::GetCtorName(clang::CXXConstructorDecl *decl) {
   if (decl->isCopyOrMoveConstructor()) {
-    std::string name = decl->isCopyConstructor() ? "copy_from" : "move_from";
-    if (CanUseShortCopyOrMoveCtorName(decl, name)) {
+    if (const char *name = GetCopyOrMoveName(decl);
+        CanUseCopyOrMoveName(decl, name)) {
       return name;
     }
     return GetOverloadedFunctionName(decl);
@@ -3358,7 +3342,7 @@ void Converter::ConvertMemberExpr(clang::MemberExpr *expr) {
   if (auto *method = clang::dyn_cast<clang::CXXMethodDecl>(member);
       method && IsOverloadedMethod(method)) {
     StrCat(token::kDot);
-    StrCat(GetOverloadedFunctionName(method));
+    StrCat(GetMethodName(method));
   } else if (!name_override.empty()) {
     StrCat(token::kDot, name_override);
   } else if (member->getDeclName().isIdentifier()) {

cpp2rust/converter/converter_lib.cpp

@@ -286,6 +286,44 @@ bool IsOverloadedMethod(const clang::CXXMethodDecl *decl) {
                        }) > 1;
 }
 
+const char *GetCopyOrMoveName(const clang::CXXMethodDecl *method) {
+  if (auto *ctor = clang::dyn_cast<clang::CXXConstructorDecl>(method)) {
+    if (ctor->isCopyConstructor()) {
+      return "copy_from";
+    }
+    if (ctor->isMoveConstructor()) {
+      return "move_from";
+    }
+    return nullptr;
+  }
+  if (method->isCopyAssignmentOperator()) {
+    return "copy_assign";
+  }
+  if (method->isMoveAssignmentOperator()) {
+    return "move_assign";
+  }
+  return nullptr;
+}
+
+bool CanUseCopyOrMoveName(const clang::CXXMethodDecl *decl,
+                          const std::string &name) {
+  const auto *record = decl->getParent();
+  bool is_unique_member =
+      std::count_if(record->method_begin(), record->method_end(),
+                    [&name](const clang::CXXMethodDecl *method) {
+                      const char *method_name = GetCopyOrMoveName(method);
+                      return !method->isDeleted() && method_name &&
+                             method_name == name;
+                    }) == 1;
+  bool is_unique_name =
+      std::none_of(record->method_begin(), record->method_end(),
+                   [&name](const clang::CXXMethodDecl *method) {
+                     return method->getDeclName().isIdentifier() &&
+                            method->getName() == name;
+                   });
+  return is_unique_member && is_unique_name;
+}
+
 bool IsUserDefinedCopyConstructor(const clang::CXXConstructorDecl *ctor) {
   return ctor->isCopyConstructor() && ctor->isUserProvided() &&
          IsUserDefinedDecl(ctor);

cpp2rust/converter/converter_lib.h

@@ -70,6 +70,11 @@ void ForEachTemplateInstantiatedMethod(
 
 bool IsOverloadedMethod(const clang::CXXMethodDecl *decl);
 
+const char *GetCopyOrMoveName(const clang::CXXMethodDecl *method);
+
+bool CanUseCopyOrMoveName(const clang::CXXMethodDecl *decl,
+                          const std::string &name);
+
 bool IsUserDefinedCopyConstructor(const clang::CXXConstructorDecl *ctor);
 
 bool IsConvertibleCopyOrMoveConstructor(const clang::CXXConstructorDecl *ctor);