Merge `TypeMapper` back into `Importer` - part 6/N: `MapKnownCcTypeToRsType`.
This CL is one of steps toward merging `TypeMapper` back into
`Importer`. The merge is:
- possible (after https://github.com/google/crubit/commit/16a5610d96eda5720bb57b5f927b00f00635ddf0 which means that there is only 1 instance
of `TypeMapper`, because `ImportFields` doesn't anymore need to
temporarily assume that the containing record can be imported),
- desirable (to support b/228868369 we need to let `ConvertType` call
into `Importer::ConvertTemplateSpecializationType`).
This CL transitions the `TypeMapper::MapKnownCcTypeToRsType` into a free
function. This is/was the last method of the `TypeMapper`, so the CL
goes one step further and removes the `TypeMapper` class altogether.
PiperOrigin-RevId: 451513327
diff --git a/rs_bindings_from_cc/importer.cc b/rs_bindings_from_cc/importer.cc
index 8e966e8..521f83d 100644
--- a/rs_bindings_from_cc/importer.cc
+++ b/rs_bindings_from_cc/importer.cc
@@ -70,8 +70,8 @@
// A mapping of C++ standard types to their equivalent Rust types.
// To produce more idiomatic results, these types receive special handling
// instead of using the generic type mapping mechanism.
-std::optional<absl::string_view> TypeMapper::MapKnownCcTypeToRsType(
- absl::string_view cc_type) const {
+std::optional<absl::string_view> MapKnownCcTypeToRsType(
+ absl::string_view cc_type) {
static const auto* const kWellKnownTypes =
new absl::flat_hash_map<absl::string_view, absl::string_view>({
{"ptrdiff_t", "isize"},
@@ -630,7 +630,7 @@
// Qualifiers are handled separately in ConvertQualType().
std::string type_string = clang::QualType(type, 0).getAsString();
- if (auto maybe_mapped_type = type_mapper_.MapKnownCcTypeToRsType(type_string);
+ if (auto maybe_mapped_type = MapKnownCcTypeToRsType(type_string);
maybe_mapped_type.has_value()) {
return MappedType::Simple(std::string(*maybe_mapped_type), type_string);
} else if (type->isPointerType() || type->isLValueReferenceType() ||
