Use const receiver since we do the mut cast at usage time

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -3383,9 +3383,7 @@ bool Converter::VisitMemberExpr(clang::MemberExpr *expr) {
     auto *base = expr->getBase();
     auto object_type = expr->isArrow() ? base->getType()->getPointeeType()
                                        : base->getType().getNonReferenceType();
-    if (!isRValue() &&
-        !clang::isa<clang::CXXThisExpr>(base->IgnoreParenImpCasts()) &&
-        object_type.isConstQualified()) {
+    if (!isRValue() && object_type.isConstQualified()) {
       if (isAddrOf()) {
         StrCat(std::format("(&raw const {}).cast_mut()", str));
         computed_expr_type_ = ComputedExprType::FreshPointer;
@@ -3443,22 +3441,12 @@ void Converter::SetUFCSReceiver(clang::Expr *base, bool is_arrow,
   }
   Buffer buf(*this);
   PushExprKind push(*this, ExprKind::LValue);
-  auto object_type = is_arrow ? base->getType()->getPointeeType()
-                              : base->getType().getNonReferenceType();
-  bool cast_mut =
-      MethodNeedsMutableReceiver(method) && object_type.isConstQualified();
   StrCat(MethodNeedsMutableReceiver(method) ? "&mut" : "&");
-  if (cast_mut) {
-    StrCat("*(&raw const");
-  }
   if (is_arrow) {
     ConvertArrow(base);
   } else {
     Convert(base);
   }
-  if (cast_mut) {
-    StrCat(").cast_mut()");
-  }
   ufcs_receiver_ = std::move(buf).str();
 }
 

cpp2rust/converter/converter_lib.cpp

@@ -606,12 +606,7 @@ bool IsRValueConvertingConstructor(const clang::CXXConstructorDecl *ctor) {
 }
 
 bool MethodNeedsMutableReceiver(const clang::CXXMethodDecl *method) {
-  if (!method->isConst()) {
-    return true;
-  }
-  return std::any_of(method->getParent()->field_begin(),
-                     method->getParent()->field_end(),
-                     [](const clang::FieldDecl *f) { return f->isMutable(); });
+  return !method->isConst();
 }
 
 bool IsPassThroughConstructor(const clang::CXXConstructorDecl *ctor) {