Don't load builtin types in cpp-rule-preprocessor

Author: lucic71

cpp2rust/converter/mapper.cpp

@@ -26,7 +26,6 @@ namespace {
 clang::ASTContext *ctx_ = nullptr;
 Model model_ = Model::kUnsafe;
 bool translation_rules_loaded_ = false;
-bool builtin_types_loaded_ = false;
 
 std::unordered_multimap<std::string, TranslationRule::ExprRule>
     exprs_; // src -> ExprRule
@@ -623,10 +622,6 @@ std::string normalizeTranslationRule(std::string rule) {
 
 PushASTContext::PushASTContext(clang::ASTContext &ctx) : prev_(ctx_) {
   ctx_ = &ctx;
-  if (!builtin_types_loaded_) {
-    builtin_types_loaded_ = true;
-    addBuiltinTypes(model_);
-  }
 }
 PushASTContext::~PushASTContext() { ctx_ = prev_; }
 
@@ -996,7 +991,6 @@ void LoadTranslationRules(Model model, clang::ASTContext &ctx,
   }
   translation_rules_loaded_ = true;
 
-  builtin_types_loaded_ = true;
   addBuiltinTypes(model);
   addRulesFromDirectory(rules_dir, model);
 

cpp2rust/cpp_rule_preprocessor.cpp

@@ -113,8 +113,7 @@ class Callback : public clang::ast_matchers::MatchFinder::MatchCallback {
       } else {
         type = var->getUnderlyingType();
       }
-      out_.try_emplace(var->getQualifiedNameAsString(),
-                       Mapper::ToString(type, Mapper::ScalarSugar::kPreserve));
+      out_.try_emplace(var->getQualifiedNameAsString(), Mapper::ToString(type));
       return;
     }