Rework predicates

Author: lucic71

cpp2rust/converter/converter_lib.cpp

@@ -263,24 +263,21 @@ bool IsUserDefinedCopyConstructor(const clang::CXXConstructorDecl *ctor) {
          IsUserDefinedDecl(ctor);
 }
 
-bool IsUserDefinedCopyOrMoveConstructor(const clang::CXXConstructorDecl *ctor) {
-  return ctor->isCopyOrMoveConstructor() && ctor->isUserProvided() &&
+bool IsUserDefinedMoveConstructor(const clang::CXXConstructorDecl *ctor) {
+  return ctor->isMoveConstructor() && ctor->isUserProvided() &&
          IsUserDefinedDecl(ctor);
 }
 
+bool IsUserDefinedCopyOrMoveConstructor(const clang::CXXConstructorDecl *ctor) {
+  return IsUserDefinedCopyConstructor(ctor) ||
+         IsUserDefinedMoveConstructor(ctor);
+}
+
 bool IsDefaultedMoveConstructor(const clang::CXXConstructorDecl *ctor) {
   return ctor->isMoveConstructor() && !ctor->isUserProvided() &&
          IsUserDefinedDecl(ctor->getParent());
 }
 
-bool IsCopyOrMoveAssignmentOrCtor(const clang::CXXMethodDecl *method) {
-  if (const auto *ctor = clang::dyn_cast<clang::CXXConstructorDecl>(method)) {
-    return ctor->isCopyOrMoveConstructor();
-  }
-  return method->isCopyAssignmentOperator() ||
-         method->isMoveAssignmentOperator();
-}
-
 clang::CXXConstructorDecl *
 GetUserDefinedCopyConstructor(const clang::RecordDecl *decl) {
   auto *cxx = clang::dyn_cast<clang::CXXRecordDecl>(decl);
@@ -308,7 +305,7 @@ bool HasDefaultedCopyConstructor(const clang::RecordDecl *decl) {
   return !cxx->defaultedCopyConstructorIsDeleted();
 }
 
-bool IsCopyConstructible(const clang::RecordDecl *decl) {
+bool HasCallableCopyConstructor(const clang::RecordDecl *decl) {
   auto *cxx = clang::dyn_cast<clang::CXXRecordDecl>(decl);
   if (!cxx) {
     return true;
@@ -341,10 +338,13 @@ bool IsConvertibleCXXRecordDecl(const clang::CXXRecordDecl *decl) {
   return decl->isThisDeclarationADefinition() &&
          std::all_of(
              decl->method_begin(), decl->method_end(), [](auto *method) {
+               auto *ctor = clang::dyn_cast<clang::CXXConstructorDecl>(method);
                return method->getDefinition() || method->isPureVirtual() ||
                       method->getTemplateInstantiationPattern() ||
                       method->getDescribedFunctionTemplate() ||
-                      IsCopyOrMoveAssignmentOrCtor(method);
+                      (ctor ? ctor->isCopyOrMoveConstructor()
+                            : method->isCopyAssignmentOperator() ||
+                                  method->isMoveAssignmentOperator());
              });
 }
 

cpp2rust/converter/converter_lib.h

@@ -65,16 +65,16 @@ bool IsOverloadedMethod(const clang::CXXMethodDecl *decl);
 
 bool IsUserDefinedCopyConstructor(const clang::CXXConstructorDecl *ctor);
 
+bool IsUserDefinedMoveConstructor(const clang::CXXConstructorDecl *ctor);
+
 bool IsUserDefinedCopyOrMoveConstructor(const clang::CXXConstructorDecl *ctor);
 
 bool IsDefaultedMoveConstructor(const clang::CXXConstructorDecl *ctor);
 
-bool IsCopyOrMoveAssignmentOrCtor(const clang::CXXMethodDecl *method);
-
 clang::CXXConstructorDecl *
 GetUserDefinedCopyConstructor(const clang::RecordDecl *decl);
 
-bool IsCopyConstructible(const clang::RecordDecl *decl);
+bool HasCallableCopyConstructor(const clang::RecordDecl *decl);
 
 bool HasDefaultedCopyConstructor(const clang::RecordDecl *decl);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -492,7 +492,7 @@ void ConverterRefCount::AddCloneTrait(const clang::RecordDecl *decl) {
     return;
   }
 
-  if (!IsCopyConstructible(cxx)) {
+  if (!HasCallableCopyConstructor(cxx)) {
     return;
   }