Trim return type

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -2465,8 +2465,8 @@ void Converter::ConvertIntegralToBooleanCast(clang::ImplicitCastExpr *expr) {
 bool Converter::IsCastRedundantInRust(clang::Expr *expr,
                                       clang::QualType target_type) {
   auto target = GetUnsafeTypeAsString(target_type);
-  if (const auto *rule = RuleRegistry::GetExprRule(ctx_, expr)) {
-    return rule->return_type.type == target;
+  if (RuleRegistry::GetExprRule(ctx_, expr)) {
+    return Trim(Mapper::GetReturnType(*this, expr)) == target;
   }
   return GetUnsafeTypeAsString(expr->getType()) == target;
 }

cpp2rust/converter/rules/expr_matcher.cpp

@@ -355,8 +355,8 @@ bool constructsReturnType(const clang::Expr *returned, clang::QualType ret,
   }
   if (auto decl = std::get_if<const clang::Decl *>(&usage_decl)) {
     auto ctor = llvm::dyn_cast<clang::CXXConstructorDecl>(*decl);
-    return ctor && ctor->getParent()->getCanonicalDecl() ==
-                       record->getCanonicalDecl();
+    return ctor &&
+           ctor->getParent()->getCanonicalDecl() == record->getCanonicalDecl();
   }
   if (auto aggregate = std::get_if<AggregateUsage>(&usage_decl)) {
     return RuleKeys::GetTypeKey(ret) == aggregate->type;

tests/unit/out/refcount/atomic.rs

@@ -18,7 +18,7 @@ pub fn main() {
 }
 fn main_0() -> i32 {
     let a: Value<Counter> = Rc::new(RefCell::new(Counter::default()));
-    let mut v: Counter = ((*a.borrow()) as Counter);
+    let mut v: Counter = (*a.borrow()).clone();
     assert!((v.n == 0));
     return 0;
 }

tests/unit/out/unsafe/atomic.rs

@@ -19,7 +19,7 @@ pub fn main() {
 }
 unsafe fn main_0() -> i32 {
     let mut a: Counter = Counter::default();
-    let mut v: Counter = (a as Counter);
+    let mut v: Counter = a;
     assert!(((v.n) == (0)));
     return 0;
 }