Fix misc style issues in Crubit.
1. (not caught by ClangTidy for some reason): missing `override` marker on virtual function overrides.
2. (ClangTidy) unnecessary `const` qualification of return value (almost completely meaningless as of C++17, since you can, without performing any copies, initialize a non-const `T` from a `const T` return value.)
3. (ClangTidy) `reserve()` call before loop/`push_back`.
PiperOrigin-RevId: 530363796
diff --git a/rs_bindings_from_cc/importer.cc b/rs_bindings_from_cc/importer.cc
index c22d7c9..11607f1 100644
--- a/rs_bindings_from_cc/importer.cc
+++ b/rs_bindings_from_cc/importer.cc
@@ -240,20 +240,20 @@
class Importer::SourceLocationComparator {
public:
- const bool operator()(const clang::SourceLocation& a,
- const clang::SourceLocation& b) const {
+ bool operator()(const clang::SourceLocation& a,
+ const clang::SourceLocation& b) const {
return b.isValid() && a.isValid() && sm.isBeforeInTranslationUnit(a, b);
}
- const bool operator()(const clang::RawComment* a,
- const clang::SourceLocation& b) const {
+ bool operator()(const clang::RawComment* a,
+ const clang::SourceLocation& b) const {
return this->operator()(a->getBeginLoc(), b);
}
- const bool operator()(const clang::SourceLocation& a,
- const clang::RawComment* b) const {
+ bool operator()(const clang::SourceLocation& a,
+ const clang::RawComment* b) const {
return this->operator()(a, b->getBeginLoc());
}
- const bool operator()(const clang::RawComment* a,
- const clang::RawComment* b) const {
+ bool operator()(const clang::RawComment* a,
+ const clang::RawComment* b) const {
return this->operator()(a->getBeginLoc(), b->getBeginLoc());
}
@@ -407,6 +407,7 @@
clang::SourceManager& sm = ctx_.getSourceManager();
std::vector<SourceLocationComparator::OrderedItem> ordered_items;
+ ordered_items.reserve(comments_.size());
for (auto& comment : comments_) {
ordered_items.push_back(
{GetSourceOrderKey(comment),
diff --git a/rs_bindings_from_cc/importers/class_template.h b/rs_bindings_from_cc/importers/class_template.h
index df3039c..b74dcf5 100644
--- a/rs_bindings_from_cc/importers/class_template.h
+++ b/rs_bindings_from_cc/importers/class_template.h
@@ -16,7 +16,7 @@
public:
ClassTemplateDeclImporter(ImportContext& context)
: DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::ClassTemplateDecl*);
+ std::optional<IR::Item> Import(clang::ClassTemplateDecl*) override;
};
} // namespace crubit
diff --git a/rs_bindings_from_cc/importers/cxx_record.h b/rs_bindings_from_cc/importers/cxx_record.h
index 852d6be..d9f4146 100644
--- a/rs_bindings_from_cc/importers/cxx_record.h
+++ b/rs_bindings_from_cc/importers/cxx_record.h
@@ -12,7 +12,7 @@
class CXXRecordDeclImporter : public DeclImporterBase<clang::CXXRecordDecl> {
public:
CXXRecordDeclImporter(ImportContext& context) : DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::CXXRecordDecl*);
+ std::optional<IR::Item> Import(clang::CXXRecordDecl*) override;
private:
std::vector<Field> ImportFields(clang::CXXRecordDecl*);
diff --git a/rs_bindings_from_cc/importers/enum.h b/rs_bindings_from_cc/importers/enum.h
index c4d1ed1..9c51640 100644
--- a/rs_bindings_from_cc/importers/enum.h
+++ b/rs_bindings_from_cc/importers/enum.h
@@ -16,7 +16,7 @@
class EnumDeclImporter : public DeclImporterBase<clang::EnumDecl> {
public:
EnumDeclImporter(ImportContext& context) : DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::EnumDecl*);
+ std::optional<IR::Item> Import(clang::EnumDecl*) override;
};
} // namespace crubit
diff --git a/rs_bindings_from_cc/importers/friend.h b/rs_bindings_from_cc/importers/friend.h
index 4015637..e4e9550 100644
--- a/rs_bindings_from_cc/importers/friend.h
+++ b/rs_bindings_from_cc/importers/friend.h
@@ -14,7 +14,7 @@
class FriendDeclImporter : public DeclImporterBase<clang::FriendDecl> {
public:
FriendDeclImporter(ImportContext& context) : DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::FriendDecl*);
+ std::optional<IR::Item> Import(clang::FriendDecl*) override;
};
} // namespace crubit
diff --git a/rs_bindings_from_cc/importers/function.h b/rs_bindings_from_cc/importers/function.h
index 99910a9..f410f85 100644
--- a/rs_bindings_from_cc/importers/function.h
+++ b/rs_bindings_from_cc/importers/function.h
@@ -13,7 +13,7 @@
class FunctionDeclImporter : public DeclImporterBase<clang::FunctionDecl> {
public:
FunctionDeclImporter(ImportContext& context) : DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::FunctionDecl*);
+ std::optional<IR::Item> Import(clang::FunctionDecl*) override;
private:
Identifier GetTranslatedParamName(const clang::ParmVarDecl* param_decl);
diff --git a/rs_bindings_from_cc/importers/function_template.h b/rs_bindings_from_cc/importers/function_template.h
index a23f622..7f3b29e 100644
--- a/rs_bindings_from_cc/importers/function_template.h
+++ b/rs_bindings_from_cc/importers/function_template.h
@@ -16,7 +16,7 @@
public:
FunctionTemplateDeclImporter(ImportContext& context)
: DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::FunctionTemplateDecl*);
+ std::optional<IR::Item> Import(clang::FunctionTemplateDecl*) override;
};
} // namespace crubit
diff --git a/rs_bindings_from_cc/importers/namespace.h b/rs_bindings_from_cc/importers/namespace.h
index a75df2a..24cda87 100644
--- a/rs_bindings_from_cc/importers/namespace.h
+++ b/rs_bindings_from_cc/importers/namespace.h
@@ -14,7 +14,7 @@
class NamespaceDeclImporter : public DeclImporterBase<clang::NamespaceDecl> {
public:
NamespaceDeclImporter(ImportContext& context) : DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::NamespaceDecl*);
+ std::optional<IR::Item> Import(clang::NamespaceDecl*) override;
};
} // namespace crubit
diff --git a/rs_bindings_from_cc/importers/typedef_name.h b/rs_bindings_from_cc/importers/typedef_name.h
index fac9459..d62463c 100644
--- a/rs_bindings_from_cc/importers/typedef_name.h
+++ b/rs_bindings_from_cc/importers/typedef_name.h
@@ -16,7 +16,7 @@
: public DeclImporterBase<clang::TypedefNameDecl> {
public:
TypedefNameDeclImporter(ImportContext& context) : DeclImporterBase(context) {}
- std::optional<IR::Item> Import(clang::TypedefNameDecl*);
+ std::optional<IR::Item> Import(clang::TypedefNameDecl*) override;
};
} // namespace crubit
