Always include common headers

Author: lucic71

cpp2rust/converter/rules/rules_loader.cpp

@@ -283,11 +283,13 @@ const llvm::json::Object &CxxIndex() {
 
 std::string BuildRulesEpilogue(const std::unordered_set<std::string> &keys,
                                bool is_cxx) {
-  std::string out;
   const auto &index = is_cxx ? CxxIndex() : CIndex();
   auto common = index.getString("common");
+  std::string out;
+  if (!common->empty()) {
+    out += "namespace cpp2rust_rules {\n" + common->str() + "}\n";
+  }
   auto rules = index.getObject("rules");
-  std::unordered_set<std::string> namespaces;
   for (const auto &key : keys) {
     auto entries = rules->getArray(key);
     if (!entries) {
@@ -302,10 +304,6 @@ std::string BuildRulesEpilogue(const std::unordered_set<std::string> &keys,
           })) {
         continue;
       }
-      if (auto ns = rule->getString("namespace");
-          ns && namespaces.insert(ns->str()).second) {
-        out += "namespace " + ns->str() + " {\n" + common->str() + "}\n";
-      }
       out += *rule->getString("text");
     }
   }

cpp2rust/rule_preprocessing/cpp_rule_indexer.cpp

@@ -223,7 +223,9 @@ std::string WrapRule(const std::string &dir_name, bool is_c,
     return std::format("#define {0} cpp2rust_rules_{1}_{0}\n{2}#undef {0}\n",
                        name, dir_name, text);
   }
-  return std::format("namespace cpp2rust_rules_{} {{\n{}}}\n", dir_name, text);
+  return std::format(
+      "namespace cpp2rust_rules {{\nnamespace cpp2rust_rules_{} {{\n{}}}\n}}\n",
+      dir_name, text);
 }
 
 void AddRule(llvm::json::Object &rules, std::string key,
@@ -271,9 +273,6 @@ void IndexRuleFile(clang::ASTContext &ctx, const std::string &dir_name,
     auto range = clang::tooling::getExtendedRange(*decl, clang::tok::semi, ctx);
     auto text = clang::tooling::getText(range, ctx).str() + '\n';
     llvm::json::Object rule{{"text", WrapRule(dir_name, is_c, name, text)}};
-    if (!is_c) {
-      rule["namespace"] = "cpp2rust_rules_" + dir_name;
-    }
     if (auto required = RequiredClasses(decl, alias); !required.empty()) {
       rule["requires"] = llvm::json::Array(required);
     }