From b41da23588f1855f1c35b417537ae47d85c45b6a Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nuno.lopes@tecnico.ulisboa.pt>
Date: Thu, 30 Apr 2026 15:59:42 +0100
Subject: [PATCH] Merge a double call to Mapper::Contains and ::Maps together

---
 cpp2rust/converter/converter.cpp                 | 6 +++---
 cpp2rust/converter/models/converter_refcount.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cpp2rust/converter/converter.cpp b/cpp2rust/converter/converter.cpp
index 0bac32da..5d50ed80 100644
--- a/cpp2rust/converter/converter.cpp
+++ b/cpp2rust/converter/converter.cpp
@@ -65,9 +65,9 @@ bool Converter::Convert(clang::QualType qual_type) {
     return false;
   }
 
-  if (Mapper::Contains(qual_type) &&
-      Mapper::Map(qual_type) != ignore_rule_type_) {
-    StrCat(Mapper::Map(qual_type));
+  auto mapped = Mapper::Map(qual_type);
+  if (!mapped.empty() && mapped != ignore_rule_type_) {
+    StrCat(mapped);
     return false;
   }
 
diff --git a/cpp2rust/converter/models/converter_refcount.cpp b/cpp2rust/converter/models/converter_refcount.cpp
index 11e275ed..68017c00 100644
--- a/cpp2rust/converter/models/converter_refcount.cpp
+++ b/cpp2rust/converter/models/converter_refcount.cpp
@@ -187,7 +187,7 @@ std::string ConverterRefCount::BuildFnAdapter(
     closure +=
         std::format("a{}: {},", i, ToString(target_proto->getParamType(i)));
   }
-  closure += "|";
+  closure += '|';
   if (!target_proto->getReturnType()->isVoidType()) {
     closure += std::format(" -> {} ", ToString(target_proto->getReturnType()));
   }
@@ -1436,7 +1436,7 @@ bool ConverterRefCount::VisitCXXForRangeStmtMap(clang::CXXForRangeStmt *stmt) {
 
   EmitByValueShadow(
       loop_var_name, loop_var->getType(), std::string(loop_var_name),
-      "Value<" + Mapper::Map(GetForRangeIteratorType(stmt)) + ">");
+      "Value<" + Mapper::Map(GetForRangeIteratorType(stmt)) + '>');
 
   ConvertForRangeBody(stmt, loop_var);