Drop get strongest iterator category

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3363,9 +3363,6 @@ bool Converter::ConvertCXXOperatorCallExpr(clang::CXXOperatorCallExpr *expr) {
   case clang::OverloadedOperatorKind::OO_Arrow:
     if (IsUniquePtr(expr->getArg(0)->getType())) {
       ConvertUniquePtrDeref(expr);
-    } else if (GetStrongestIteratorCategory(ctx_, expr->getArg(0)->getType()) ==
-               IteratorCategory::Bidirectional) {
-      Convert(expr->getArg(0));
     } else if (expr->getOperator() == clang::OverloadedOperatorKind::OO_Star) {
       PushParen paren(*this);
       StrCat(token::kStar);
@@ -5453,14 +5450,6 @@ void Converter::ConvertConstructFromArgs(clang::QualType type,
 std::string Converter::AccessLValueObject(clang::MemberExpr *member) {
   auto *object = member->getBase();
   auto type = object->getType();
-  if (member->isArrow()) {
-    auto *op =
-        clang::dyn_cast<clang::CXXOperatorCallExpr>(object->IgnoreImplicit());
-    if (op && GetStrongestIteratorCategory(ctx_, op->getArg(0)->getType()) ==
-                  IteratorCategory::Bidirectional) {
-      return ToString(object);
-    }
-  }
   if (type->isPointerType() ||
       (IsReferenceType(object) && clang::isa<clang::CallExpr>(object))) {
     return std::format("({}{})", GetPointerDerefPrefix(type->getPointeeType()),

cpp2rust/converter/converter_lib.cpp

@@ -1892,7 +1892,7 @@ clang::Expr *GetCallee(clang::CallExpr *expr) {
 }
 
 bool HasReceiver(clang::Expr *expr) {
-  if (clang::isa<clang::CXXMemberCallExpr>(expr))
+  if (clang::isa<clang::CXXMemberCallExpr, clang::MemberExpr>(expr))
     return true;
   if (auto *opcall = clang::dyn_cast<clang::CXXOperatorCallExpr>(expr)) {
     if (auto *callee = opcall->getCalleeDecl()) {
@@ -1920,26 +1920,6 @@ std::optional<clang::QualType> GetParamImplicitConvertTarget(clang::Expr *expr,
   return fn->getParamDecl(param_idx)->getType().getNonReferenceType();
 }
 
-std::optional<IteratorCategory>
-GetStrongestIteratorCategory(clang::ASTContext &ctx, clang::QualType type) {
-  type = type.getNonReferenceType().getUnqualifiedType();
-  if (!Mapper::Contains(ctx, type)) {
-    return std::nullopt;
-  }
-  if (RuleRegistry::MapsToRefcountPointer(ctx, type)) {
-    return IteratorCategory::Contiguous;
-  }
-  auto mapped = Mapper::Map(ctx, type);
-  if (mapped.empty()) {
-    return std::nullopt;
-  }
-  if (mapped.starts_with("BidirectionalIterator<") ||
-      mapped.starts_with("UnsafeBidirectionalIterator<")) {
-    return IteratorCategory::Bidirectional;
-  }
-  return std::nullopt;
-}
-
 std::string GetClassName(clang::QualType type) {
   if (auto *record = type->getAsCXXRecordDecl())
     return record->getQualifiedNameAsString();

cpp2rust/converter/converter_lib.h

@@ -28,17 +28,6 @@ class Sema;
 
 namespace cpp2rust {
 
-// Order matters: each category is a superset of the previous one.
-// Use >= to check "at least this capable".
-enum class IteratorCategory {
-  Forward,
-  Bidirectional,
-  RandomAccess,
-  Contiguous,
-};
-
-std::optional<IteratorCategory>
-GetStrongestIteratorCategory(clang::ASTContext &ctx, clang::QualType type);
 bool IsBuiltinConstantP(const clang::Expr *expr);
 
 bool IsGlobalVar(const clang::VarDecl *decl);

cpp2rust/converter/models/converter_refcount.cpp

@@ -97,8 +97,8 @@ static bool IsFieldOfVectorElem(const clang::MemberExpr *expr) {
 }
 
 static bool IsPointerType(clang::ASTContext &ctx, clang::QualType type) {
-  return type->isPointerType() || GetStrongestIteratorCategory(ctx, type) ==
-                                      IteratorCategory::Contiguous;
+  return type->isPointerType() ||
+         RuleRegistry::MapsToRefcountPointer(ctx, type);
 }
 
 void ConverterRefCount::PendingDeref::set(std::string str, bool fresh) {
@@ -2848,12 +2848,6 @@ bool ConverterRefCount::ConvertCXXOperatorCallExpr(
       break;
     }
 
-    if (GetStrongestIteratorCategory(ctx_, expr->getArg(0)->getType()) ==
-        IteratorCategory::Bidirectional) {
-      Convert(expr->getArg(0));
-      break;
-    }
-
     {
       bool deref = !isAddrOf();
       PushParen paren(*this, deref);
@@ -3314,7 +3308,8 @@ void ConverterRefCount::ConvertArrow(clang::Expr *expr) {
   bool is_overloaded_arrow =
       op && op->getOperator() == clang::OverloadedOperatorKind::OO_Arrow;
 
-  if (!is_overloaded_arrow || IsUserOperatorCall(op)) {
+  if (!is_overloaded_arrow || IsUserOperatorCall(op) ||
+      RuleRegistry::ReturnsPointer(ctx_, expr)) {
     auto pointee_type = expr->getType()->getPointeeType();
     // Virtual methods, which take &mut self, are called through PtrDyn.
     if (auto *record = pointee_type->getAsRecordDecl();
@@ -3333,12 +3328,6 @@ void ConverterRefCount::ConvertArrow(clang::Expr *expr) {
     return;
   }
 
-  if (GetStrongestIteratorCategory(ctx_, op->getArg(0)->getType()) ==
-      IteratorCategory::Bidirectional) {
-    Convert(op->getArg(0));
-    return;
-  }
-
   Convert(expr);
 }
 
@@ -3348,12 +3337,6 @@ std::string ConverterRefCount::AccessLValueObject(clang::MemberExpr *member) {
 
   bool is_mut = method && !method->isConst();
   if (member->isArrow()) {
-    auto *op =
-        clang::dyn_cast<clang::CXXOperatorCallExpr>(object->IgnoreImplicit());
-    if (op && GetStrongestIteratorCategory(ctx_, op->getArg(0)->getType()) ==
-                  IteratorCategory::Bidirectional) {
-      return ConvertRValue(op->getArg(0));
-    }
     auto str = is_mut ? ConvertLValue(object) : ConvertRValue(object);
     auto pointee_type = object->getType()->getPointeeType();
     return DerefPtrExpr(str, pointee_type);

cpp2rust/converter/rules/decls.h

@@ -42,7 +42,6 @@ const clang::Expr *GetReturned(const clang::FunctionDecl *rule);
 const clang::Expr *GetMacroMemberBase(const clang::SourceManager &sm,
                                       const clang::MemberExpr *member);
 
-
 std::optional<std::vector<clang::TemplateArgument>>
 DeduceFromType(clang::Sema &sema, clang::TemplateParameterList *params,
                clang::QualType pattern, clang::QualType actual);

cpp2rust/converter/rules/registry.cpp

@@ -12,10 +12,10 @@
 #include <llvm/ADT/StringExtras.h>
 
 #include <algorithm>
-#include <set>
 #include <cstdlib>
 #include <filesystem>
 #include <format>
+#include <set>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
@@ -88,7 +88,8 @@ clang::QualType getInitPattern(const clang::FunctionDecl *rule) {
 void collectGenerics(const std::vector<TranslationRule::BodyFragment> &body,
                      std::set<unsigned> &used) {
   for (const auto &fragment : body) {
-    if (auto generic = std::get_if<TranslationRule::GenericFragment>(&fragment)) {
+    if (auto generic =
+            std::get_if<TranslationRule::GenericFragment>(&fragment)) {
       used.insert(generic->n);
     } else if (auto call = std::get_if<
                    std::unique_ptr<TranslationRule::MethodCallFragment>>(

cpp2rust/rule_preprocessing/cpp_rule_indexer.cpp

@@ -138,7 +138,8 @@ class DeclaredNames : public clang::RecursiveASTVisitor<DeclaredNames> {
 public:
   explicit DeclaredNames(const clang::SourceManager &sm) : sm_(sm) {}
 
-  bool VisitTemplateSpecializationType(clang::TemplateSpecializationType *type) {
+  bool
+  VisitTemplateSpecializationType(clang::TemplateSpecializationType *type) {
     add(type->getTemplateName().getAsTemplateDecl());
     return true;
   }