Remove PushSuppressIteratorClone

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3912,8 +3912,6 @@ void Converter::ConvertCXXConstructExprArgs(clang::CXXConstructExpr *expr) {
 }
 
 bool Converter::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
-  PushSuppressIteratorClone push(*this, expr);
-
   if (expr->isElidable()) {
     Convert(expr->getArg(0));
     return false;
@@ -3936,11 +3934,9 @@ bool Converter::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
     return false;
   }
   if (IsPassThroughConstructor(ctor)) {
-    // Take suppress before recursing into the child.
-    bool suppress = PushSuppressIteratorClone::take(*this);
     Convert(expr->getArg(0));
     if ((ctor->isCopyConstructor() || IsDefaultedMoveConstructor(ctor)) &&
-        !suppress && !TypeIsCopyable(expr->getType())) {
+        !TypeIsCopyable(expr->getType())) {
       StrCat(".clone()");
       SetFreshType(expr->getType());
     }

cpp2rust/converter/converter.h

@@ -841,7 +841,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
   std::string ufcs_receiver_;
   bool in_const_initializer_ = false;
   std::optional<bool> autoref_mut_;
-  bool suppress_iterator_clone_ = false;
 
   struct PushExplicitAutoref {
     Converter &c;
@@ -853,41 +852,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
     ~PushExplicitAutoref() { c.autoref_mut_ = prev; }
   };
 
-  struct PushSuppressIteratorClone {
-    Converter &c;
-    bool prev;
-    PushSuppressIteratorClone(Converter &c, clang::CXXConstructExpr *expr)
-        : c(c), prev(c.suppress_iterator_clone_) {
-      auto *ctor = expr->getConstructor();
-      if (!ctor->isCopyOrMoveConstructor() &&
-          ctor->isConvertingConstructor(/*AllowExplicit=*/false) &&
-          ctor->getNumParams() == 1 && IsIteratorType(expr->getType())) {
-        c.suppress_iterator_clone_ = true;
-      }
-    }
-    ~PushSuppressIteratorClone() { c.suppress_iterator_clone_ = prev; }
-    PushSuppressIteratorClone(const PushSuppressIteratorClone &) = delete;
-    PushSuppressIteratorClone &
-    operator=(const PushSuppressIteratorClone &) = delete;
-
-    static bool take(Converter &c) {
-      return std::exchange(c.suppress_iterator_clone_, false);
-    }
-
-  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;
-    }
-  };
-
   struct PushConstInitializer {
     Converter &c;
     bool prev;

cpp2rust/converter/models/converter_refcount.cpp

@@ -2375,7 +2375,6 @@ bool ConverterRefCount::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
                      getConversionKind() != ConversionKind::Unboxed;
   PushConversionKind push(*this, boxed_array ? ConversionKind::Pointee
                                              : ConversionKind::Unboxed);
-  PushSuppressIteratorClone push_suppress(*this, expr);
 
   if (auto str = GetMappedAsString(expr, expr->getArgs(), expr->getNumArgs());
       !str.empty()) {
@@ -2408,9 +2407,7 @@ bool ConverterRefCount::VisitCXXConstructExpr(clang::CXXConstructExpr *expr) {
 
   if (ctor->isCopyOrMoveConstructor() &&
       !IsConvertibleCopyOrMoveConstructor(ctor)) {
-    StrCat(PushSuppressIteratorClone::take(*this)
-               ? ConvertRValue(expr->getArg(0))
-               : ConvertFreshRValue(expr->getArg(0)));
+    StrCat(ConvertFreshRValue(expr->getArg(0)));
     return false;
   }
 

rules/iterator_category/tgt_refcount.rs

@@ -24,7 +24,7 @@ fn t5<T1>() -> RandomAccessIterator<T1> {
 }
 
 fn f1<T1: CppIterator<T2>, T2>(a0: T1) -> T1 {
-    a0.clone()
+    (a0).clone()
 }
 
 fn f2<T1: CppIterator<T2>, T2>(a0: T1) -> T1 {

rules/iterator_category/tgt_unsafe.rs

@@ -24,7 +24,7 @@ fn t5<T1>() -> UnsafeRandomAccessIterator<T1> {
 }
 
 unsafe fn f1<T1: UnsafeCppIterator<T2>, T2>(a0: T1) -> T1 {
-    a0.clone()
+    (a0).clone()
 }
 
 unsafe fn f2<T1: UnsafeCppIterator<T2>, T2>(a0: T1) -> T1 {