Replace GetNameOfScalarTypedef with kPreserve flag in ToString

Author: lucic71

cpp2rust/converter/mapper.cpp

@@ -415,7 +415,6 @@ search(clang::QualType qual_type) {
     return {};
   }
   auto res = search(types_, type, GetTypeMapKey(type));
-  auto res = search(types_, type, GetTypeMapKey(type));
   log() << "search type " << type
         << ", result: " << (res.first ? res.first->type_info.type : "None")
         << '\n';
@@ -796,6 +795,9 @@ std::string ToString(clang::QualType qual_type, ScalarSugar sugar) {
     }
   }
 
+    }
+  }
+
   if (auto cxx_record_decl = qual_type->getAsCXXRecordDecl()) {
     if (cxx_record_decl->isLambda()) {
       return ToString(cxx_record_decl->getLambdaCallOperator());

cpp2rust/cpp_rule_preprocessor.cpp

@@ -117,10 +117,7 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
           type = lookupType(tdecl);
         }
       }
-      auto src = GetNameOfScalarTypedef(type);
-      if (src.empty()) {
-        src = Mapper::ToString(type);
-      }
+      auto src = Mapper::ToString(type, Mapper::ScalarSugar::kPreserve);
       out_.try_emplace(var->getQualifiedNameAsString(), std::move(src));
       return;
     }