Drop the IsIteratorType check

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2770,7 +2770,7 @@ bool Converter::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
       (ctor->isConvertingConstructor(false) && ctor->getNumParams() == 1 &&
        ctor->getParamDecl(0)->getType()->isRValueReferenceType())) {
     // Take supress before recursing into the child.
-    bool suppress = PushSuppressIteratorClone::take(*this, expr);
+    bool suppress = PushSuppressIteratorClone::take(*this);
     Convert(expr->getArg(0));
     if (ctor->isCopyConstructor() && !suppress) {
       StrCat(".clone()");

cpp2rust/converter/converter.h

@@ -13,6 +13,7 @@
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "converter/lex.h"
@@ -547,8 +548,9 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     PushSuppressIteratorClone(Converter &c, clang::CXXConstructExpr *expr)
         : c(c), prev(c.suppress_iterator_clone_) {
       auto *ctor = expr->getConstructor();
-      if (ctor->isConvertingConstructor(/*AllowExplicit=*/false) &&
-          ctor->getNumParams() == 1 && IsIteratorType(expr->getType())) {
+      if (!ctor->isCopyOrMoveConstructor() &&
+          ctor->isConvertingConstructor(/*AllowExplicit=*/false) &&
+          ctor->getNumParams() == 1) {
         c.suppress_iterator_clone_ = true;
       }
     }
@@ -557,24 +559,8 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     PushSuppressIteratorClone &
     operator=(const PushSuppressIteratorClone &) = delete;
 
-    static bool take(Converter &c, clang::CXXConstructExpr *inner) {
-      bool suppress =
-          c.suppress_iterator_clone_ && IsIteratorType(inner->getType());
-      c.suppress_iterator_clone_ = false;
-      return suppress;
-    }
-
-  private:
-    static bool IsIteratorType(clang::QualType qt) {
-      if (auto *record = qt->getAsCXXRecordDecl()) {
-        for (auto *d : record->decls()) {
-          if (auto *tnd = llvm::dyn_cast<clang::TypedefNameDecl>(d)) {
-            if (tnd->getName() == "iterator_category")
-              return true;
-          }
-        }
-      }
-      return false;
+    static bool take(Converter &c) {
+      return std::exchange(c.suppress_iterator_clone_, false);
     }
   };
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -1565,7 +1565,7 @@ bool ConverterRefCount::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
   }
 
   if (ctor->isCopyConstructor()) {
-    StrCat(PushSuppressIteratorClone::take(*this, expr)
+    StrCat(PushSuppressIteratorClone::take(*this)
                ? ConvertRValue(expr->getArg(0))
                : ConvertFreshRValue(expr->getArg(0)));
     return false;