Don't use cpp2rust:: inside the cpp2rust namespace

Author: lucic71

cpp2rust/converter/mapper.cpp

@@ -397,8 +397,7 @@ TranslationRule::TypeRule *search(clang::QualType qual_type) {
   auto type = ToString(qual_type);
   auto [rule, subs] = search(types_, type, GetTypeMapKey(type));
   verrs() << "search type " << type
-               << ", result: " << (rule ? rule->type_info.type : "None")
-               << '\n';
+          << ", result: " << (rule ? rule->type_info.type : "None") << '\n';
   return rule;
 }
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -824,7 +824,7 @@ static std::vector<const char *> printf2fmt(std::string &format) {
         }
       }
     }
-    cpp2rust::verrs() << "Unknown printf format: " << format << "\n";
+    verrs() << "Unknown printf format: " << format << "\n";
     assert(0);
   }
   return types;
@@ -838,9 +838,9 @@ void ConverterRefCount::ConvertPrintf(clang::CallExpr *expr) {
           expr->getArg(is_fprintf)->IgnoreImplicit())) {
     format = GetEscapedStringLiteral(str);
   } else {
-    cpp2rust::verrs() << "Uknown fprintf format: ";
-    expr->getArg(1)->dump(cpp2rust::verrs(), ctx_);
-    cpp2rust::verrs() << "\n";
+    verrs() << "Uknown fprintf format: ";
+    expr->getArg(1)->dump(verrs(), ctx_);
+    verrs() << "\n";
     exit(1);
   }
   bool ends_newline = format.ends_with("\\n\"");
@@ -851,7 +851,7 @@ void ConverterRefCount::ConvertPrintf(clang::CallExpr *expr) {
   } else if (fd == "stderr" || fd == "__stderrp") {
     StrCat(ends_newline ? "eprintln!(" : "eprint!(");
   } else {
-    cpp2rust::verrs() << "Uknown fprintf fd: " << fd << "\n";
+    verrs() << "Uknown fprintf fd: " << fd << "\n";
     exit(1);
   }
   if (ends_newline) {

cpp2rust/converter/plugins/emplace_back.cpp

@@ -183,7 +183,7 @@ bool Converter::emplace_back_plugin_convert(clang::CallExpr *call) {
       StrCat(GetUnsafeTypeAsString(elem_ty));
     }
   } else {
-    call->dump(cpp2rust::verrs(), ctx_);
+    call->dump(verrs(), ctx_);
     assert(0 && "no ctor and no pod type");
     return false;
   }

cpp2rust/converter/translation_rule.cpp

@@ -28,6 +28,7 @@
 
 #include "compat/platform_flags.h"
 #include "converter/mapper.h"
+#include "logging.h"
 
 namespace cpp2rust::TranslationRule {
 
@@ -862,7 +863,7 @@ void LoadTgtFromIR(ExprRules &exprs, TypeRules &types,
   auto parsed = llvm::json::parse((*buf)->getBuffer());
   if (!parsed) {
     verrs() << "Failed to parse IR JSON: " << json_path << ": "
-                 << llvm::toString(parsed.takeError()) << '\n';
+            << llvm::toString(parsed.takeError()) << '\n';
     assert(0);
     return;
   }
@@ -900,9 +901,7 @@ void BodyFragmentDump(const BodyFragment &frag) {
 
 } // namespace
 
-void TextFragment::dump() const {
-  verrs() << "  text: \"" << text << "\"\n";
-}
+void TextFragment::dump() const { verrs() << "  text: \"" << text << "\"\n"; }
 
 void PlaceholderFragment::dump() const {
   verrs() << "  placeholder: " << n;
@@ -930,7 +929,7 @@ const PlaceholderFragment *MethodCallFragment::getReceiverPlaceholder() const {
 
 void MethodCallFragment::dump() const {
   verrs() << "  method_call:\n"
-                  "    receiver:\n";
+             "    receiver:\n";
   for (const auto &frag : receiver) {
     BodyFragmentDump(frag);
   }
@@ -966,9 +965,7 @@ void ExprRule::dump() const {
   }
 }
 
-void GenericFragment::dump() const {
-  verrs() << "  generic: " << n << '\n';
-}
+void GenericFragment::dump() const { verrs() << "  generic: " << n << '\n'; }
 
 void TypeInfo::dump() const {
   verrs() << type;