Remove ctx from MapBinding

Author: lucic71

cpp2rust/converter/mapper.cpp

@@ -47,15 +47,15 @@ std::string InstantiateTemplate(clang::ASTContext &ctx, const clang::Expr *expr,
   }
   auto &ty = subs.at(n - 1);
   if (ty) {
-    ty = Matcher::MapBinding(ctx, subs, n - 1);
+    ty = Matcher::MapBinding(subs, n - 1);
   }
   return Matcher::InstantiateTgt(subs, text);
 }
 
 std::string Map(clang::ASTContext &ctx, clang::QualType qual_type) {
   auto [rule, subs] = RuleRegistry::Search(ctx, qual_type);
   if (rule) {
-    return Matcher::InstantiateTgt(Matcher::MapBindings(ctx, subs),
+    return Matcher::InstantiateTgt(Matcher::MapBindings(subs),
                                    rule->type_info.type);
   }
   return {};
@@ -64,7 +64,7 @@ std::string Map(clang::ASTContext &ctx, clang::QualType qual_type) {
 std::string MapInitializer(clang::ASTContext &ctx, clang::QualType qual_type) {
   auto [rule, subs] = RuleRegistry::Search(ctx, qual_type);
   if (rule && !rule->initializer.empty()) {
-    return Matcher::InstantiateTgt(Matcher::MapBindings(ctx, subs),
+    return Matcher::InstantiateTgt(Matcher::MapBindings(subs),
                                    rule->initializer);
   }
   return {};
@@ -73,7 +73,7 @@ std::string MapInitializer(clang::ASTContext &ctx, clang::QualType qual_type) {
 std::string GetParamType(clang::ASTContext &ctx, const clang::Expr *expr,
                          unsigned index) {
   auto [rule, subs] = RuleRegistry::Search(ctx, expr);
-  return Matcher::InstantiateTgt(Matcher::MapBindings(ctx, subs),
+  return Matcher::InstantiateTgt(Matcher::MapBindings(subs),
                                  rule->params.at(index).type);
 }
 

cpp2rust/converter/rules/matcher.cpp

@@ -8,11 +8,11 @@
 
 namespace cpp2rust::Matcher {
 
-Bindings MapBindings(clang::ASTContext &ctx, const Bindings &bindings) {
+Bindings MapBindings(const Bindings &bindings) {
   Bindings mapped(bindings.size());
   for (unsigned i = 0; i < bindings.size(); ++i) {
     if (bindings[i]) {
-      mapped[i] = MapBinding(ctx, bindings, i);
+      mapped[i] = MapBinding(bindings, i);
     }
   }
   return mapped;

cpp2rust/converter/rules/matcher.h

@@ -30,9 +30,8 @@ Match<TranslationRule::TypeRule> Find(clang::ASTContext &ctx,
 
 bool HasRuleNamed(clang::ASTContext &ctx, const clang::FunctionDecl *decl);
 
-std::string MapBinding(clang::ASTContext &ctx, const Bindings &bindings,
-                       unsigned n);
-Bindings MapBindings(clang::ASTContext &ctx, const Bindings &bindings);
+std::string MapBinding(const Bindings &bindings, unsigned n);
+Bindings MapBindings(const Bindings &bindings);
 
 std::string InstantiateTgt(const Bindings &types,
                            const std::string &tgt_template);

cpp2rust/converter/rules/string_matcher.cpp

@@ -389,8 +389,7 @@ bool HasRuleNamed(clang::ASTContext &ctx, const clang::FunctionDecl *decl) {
               .empty();
 }
 
-std::string MapBinding(clang::ASTContext &ctx, const Bindings &bindings,
-                       unsigned n) {
+std::string MapBinding(const Bindings &bindings, unsigned n) {
   return mapTypeString(bindings.at(n).value());
 }