Fix a few things found using clang-tidy with the bant-generated compi…

…lation DB.

Can't switch entirely yet, as it does not emit proper include directories
for targets that have an include = [] defined.

.clang-tidy

@@ -15,6 +15,7 @@ Checks: >
   -readability-identifier-length,
   -readability-implicit-bool-conversion,
   -readability-magic-numbers,
+  -readability-named-parameter,
   -readability-static-definition-in-anonymous-namespace,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
@@ -38,3 +39,10 @@ Checks: >
   -misc-no-recursion,
   -misc-unused-parameters,
   -misc-use-anonymous-namespace,
+CheckOptions:
+  # Structs can not have non-public memebers, so they should be public.
+  # but clang-tidy warns about them anyway as being visible.
+  # clang-tidy can't distinguish between classes and structs, so approximate
+  # with this:
+  - key: misc-non-private-member-variables-in-classes.IgnoreClassesWithAllMemberVariablesBeingPublic
+    value: '1'

bant/explore/header-providers.h

@@ -22,9 +22,12 @@
 #include <optional>
 #include <ostream>
 #include <string>
+#include <string_view>
 
+#include "absl/container/btree_set.h"
 #include "bant/frontend/parsed-project.h"
 #include "bant/session.h"
+#include "bant/types-bazel.h"
 #include "bant/types.h"
 
 // TODO: Given that this not only provides HeaderToLibMapping but also

bant/explore/query-utils.h

@@ -21,11 +21,11 @@
 #include <functional>
 #include <initializer_list>
 #include <string_view>
+#include <vector>
 
 #include "bant/frontend/ast.h"
 
-namespace bant {
-namespace query {
+namespace bant::query {
 // A Smörgåsbord of keyword parameters found for binaries, cc_libraries rules
 // and other 'calls' to rules we look at. Starts to get a bit crowded (but
 // is also cheap, as a instance is re-used and only passed by reference).
@@ -73,7 +73,6 @@ std::vector<std::string_view> ExtractStringList(List *list);
 // Similar to ExtractStringList(), but append to vector.
 void AppendStringList(List *list, std::vector<std::string_view> &append_to);
 
-}  // namespace query
-}  // namespace bant
+}  // namespace bant::query
 
 #endif  // BANT_QUERY_UTILS_

bant/frontend/BUILD

@@ -109,11 +109,13 @@ cc_library(
         ":parser",
         ":source-locator",
         "//bant:session",
+        "//bant:types",
         "//bant:types-bazel",
         "//bant:workspace",
         "//bant/explore:query-utils",
         "//bant/util:disjoint-range-map",
         "//bant/util:file-utils",
+        "//bant/util:memory",
         "//bant/util:stat",
         "@abseil-cpp//absl/log:check",
     ],

bant/frontend/ast.h

@@ -18,6 +18,7 @@
 #ifndef BANT_AST_H_
 #define BANT_AST_H_
 
+#include <cstddef>
 #include <cstdint>
 #include <ostream>
 #include <string_view>
@@ -150,6 +151,7 @@ class UnaryExpr : public Node {
   friend class BaseNodeReplacementVisitor;
   explicit UnaryExpr(TokenType op, Node *n) : node_(n), op_(op) {}
 
+ private:
   Node *node_;
   const TokenType op_;
 };
@@ -163,8 +165,8 @@ class BinNode : public Node {
   friend class BaseNodeReplacementVisitor;
   BinNode(Node *lhs, Node *rhs) : left_(lhs), right_(rhs) {}
 
-  Node *left_;
-  Node *right_;
+  Node *left_;   // NOLINT(misc-non-private-member-variables-in-classes)
+  Node *right_;  // NOLINT(misc-non-private-member-variables-in-classes)
 };
 
 // Generally some tree element that takes two nodes
@@ -317,7 +319,7 @@ class VoidVisitor {
   virtual void VisitIdentifier(Identifier *) = 0;  // Leaf.
 
   // Utility function: if node exists, walk and return 'true'.
-  inline bool WalkNonNull(Node *node) {
+  bool WalkNonNull(Node *node) {
     if (node) node->Accept(this);
     return node;
   }
@@ -368,9 +370,7 @@ class NodeVisitor {
   virtual Node *VisitIdentifier(Identifier *) = 0;  // Leaf.
 
   // Utility function: if node exists, walk and return valud from visit.
-  inline Node *WalkNonNull(Node *node) {
-    return node ? node->Accept(this) : node;
-  }
+  Node *WalkNonNull(Node *node) { return node ? node->Accept(this) : node; }
 };
 
 // Replace nodes with whatever walk on that node yielded.
@@ -429,7 +429,7 @@ class BaseNodeReplacementVisitor : public NodeVisitor {
   Node *VisitIdentifier(Identifier *i) override { return i; }
 
  private:
-  inline void ReplaceWalk(Node **n) { *n = WalkNonNull(*n); }
+  void ReplaceWalk(Node **n) { *n = WalkNonNull(*n); }
 };
 
 class PrintVisitor : public BaseVoidVisitor {

bant/frontend/elaboration.h

@@ -25,6 +25,7 @@
 #include "bant/frontend/ast.h"
 #include "bant/frontend/parsed-project.h"
 #include "bant/session.h"
+#include "bant/types-bazel.h"
 
 namespace bant {
 

bant/frontend/linecolumn-map.h

@@ -18,6 +18,8 @@
 #ifndef BANT_LINE_COLUMN_MAP_
 #define BANT_LINE_COLUMN_MAP_
 
+#include <cstddef>
+#include <string_view>
 #include <vector>
 
 #include "bant/frontend/source-locator.h"  // Provides LineColumn/Range

bant/frontend/named-content.h

@@ -18,6 +18,7 @@
 #ifndef BANT_NAMED_CONTENT_
 #define BANT_NAMED_CONTENT_
 
+#include <cstddef>
 #include <string>
 #include <string_view>
 

bant/frontend/parsed-project.h

@@ -18,14 +18,19 @@
 #ifndef BANT_PROJECT_PARDER_
 #define BANT_PROJECT_PARDER_
 
+#include <memory>
 #include <ostream>
 #include <string>
+#include <string_view>
+#include <utility>
 
 #include "bant/frontend/ast.h"
 #include "bant/frontend/named-content.h"
 #include "bant/frontend/source-locator.h"
 #include "bant/session.h"
 #include "bant/types-bazel.h"
+#include "bant/types.h"
+#include "bant/util/arena.h"
 #include "bant/util/disjoint-range-map.h"
 #include "bant/util/file-utils.h"
 #include "bant/workspace.h"
@@ -45,9 +50,11 @@ class ParsedBuildFile {
 
   std::string_view name() const { return source_.source_name(); }
 
+  // NOLINTBEGIN(misc-non-private-member-variables-in-classes) // TODO: fix
   BazelPackage package;
   List *ast;           // parsed AST. Content owned by arena in ParsedProject
   std::string errors;  // List of errors if observed (todo: make actual list)
+  // NOLINTEND(misc-non-private-member-variables-in-classes)
 
  private:
   friend class ParsedProject;  // It is allowed to access source_ directly.

bant/frontend/parsed-project_testutil.h

@@ -18,6 +18,10 @@
 #ifndef BANT_PARSED_PROJECT_TESTUTIL_
 #define BANT_PARSED_PROJECT_TESTUTIL_
 
+#include <iostream>
+#include <string>
+#include <string_view>
+
 #include "absl/strings/str_cat.h"
 #include "bant/frontend/elaboration.h"
 #include "bant/frontend/parsed-project.h"
@@ -34,7 +38,7 @@ class ParsedProjectTestUtil {
     auto package_or = BazelPackage::ParseFrom(package_str);
     if (!package_or.has_value()) return nullptr;
     SessionStreams streams(&std::cerr, &std::cerr);
-    std::string fake_filename = absl::StrCat(package_str, "/BUILD");
+    const std::string fake_filename = absl::StrCat(package_str, "/BUILD");
     return project_.AddBuildFileContent(streams, *package_or, fake_filename,
                                         std::string(content));
   }

bant/frontend/scanner.h

@@ -88,7 +88,7 @@ class Scanner {
   // All tokens returned by the Scanner are sub-string_views of the larger
   // content; this allows correspondence with the original text to extract
   // source.Loc() information.
-  Scanner(NamedLineIndexedContent &source);
+  explicit Scanner(NamedLineIndexedContent &source);
 
   // Advance to next token and return it.
   Token Next();

bant/frontend/source-locator.h

@@ -18,6 +18,8 @@
 #ifndef BANT_SOURCE_LOCATOR_
 #define BANT_SOURCE_LOCATOR_
 
+#include <ostream>
+#include <string>
 #include <string_view>
 
 namespace bant {

bant/session.h

@@ -21,6 +21,7 @@
 #include <memory>
 #include <ostream>
 #include <string_view>
+#include <vector>
 
 #include "bant/output-format.h"
 #include "bant/types.h"

bant/tool/BUILD

@@ -18,6 +18,7 @@ cc_library(
     hdrs = ["edit-callback_testutil.h"],
     deps = [
         ":edit-callback",
+        "//bant:types-bazel",
         "@abseil-cpp//absl/container:flat_hash_set",
         "@abseil-cpp//absl/strings",
         "@googletest//:gtest",

bant/tool/canon-targets.h

@@ -21,6 +21,7 @@
 #include <cstdlib>
 
 #include "bant/frontend/parsed-project.h"
+#include "bant/session.h"
 #include "bant/tool/edit-callback.h"
 #include "bant/types-bazel.h"
 

bant/tool/compilation-db.cc

@@ -37,6 +37,7 @@
 //  - compilation db should also include all external projects.
 //  - more readable output of json with indentation and stuff without having
 //    to resort to external lib.
+//  - if there are any cc-libraries with includes = [], add these
 namespace bant {
 
 // Make quoted strings a little less painful to read and write in C++
@@ -81,6 +82,7 @@ static std::string CollectAllExternallIncDirs(const ParsedProject &project) {
   std::stringstream out;
   const BazelWorkspace &workspace = project.workspace();
   absl::flat_hash_set<std::string> already_seen;
+  // TODO: if there are any cc-libraries with includes = [], add these
   for (const auto &[_, parsed_package] : project.ParsedFiles()) {
     const BazelPackage &current_package = parsed_package->package;
     query::FindTargets(

bant/tool/dwyu-internal.h

@@ -18,7 +18,11 @@
 #ifndef BANT_TOOL_DWYU_INTERNAL_
 #define BANT_TOOL_DWYU_INTERNAL_
 
-#include <set>
+#include <cstddef>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <vector>
 
 #include "absl/container/btree_map.h"
 #include "absl/container/btree_set.h"
@@ -28,6 +32,7 @@
 #include "bant/session.h"
 #include "bant/tool/edit-callback.h"
 #include "bant/types-bazel.h"
+#include "bant/types.h"
 
 namespace bant {
 // The DWYUGenerator is the underlying implementation, for which

bant/tool/dwyu.h

@@ -18,9 +18,11 @@
 #ifndef BANT_TOOL_DWYU_
 #define BANT_TOOL_DWYU_
 
+#include <cstddef>
 #include <string_view>
 #include <vector>
 
+#include "bant/frontend/named-content.h"
 #include "bant/frontend/parsed-project.h"
 #include "bant/session.h"
 #include "bant/tool/edit-callback.h"

bant/tool/edit-callback.h

@@ -19,6 +19,7 @@
 #define BANT_TOOL_EDIT_CALLBACK_
 
 #include <functional>
+#include <ostream>
 #include <string_view>
 
 #include "bant/types-bazel.h"

bant/tool/edit-callback_testutil.h

@@ -18,9 +18,13 @@
 #ifndef BANT_TOOL_EDIT_CALLBACK_TESTUTIL_
 #define BANT_TOOL_EDIT_CALLBACK_TESTUTIL_
 
+#include <string>
+#include <string_view>
+
 #include "absl/container/flat_hash_set.h"
 #include "absl/strings/str_cat.h"
 #include "bant/tool/edit-callback.h"
+#include "bant/types-bazel.h"
 #include "gtest/gtest.h"
 
 namespace bant {

bant/types-bazel.h

@@ -23,6 +23,7 @@
 #include <ostream>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include "re2/re2.h"
 

bant/util/arena-container.h

@@ -21,6 +21,7 @@
 #define BANT_ARENA_CONTAINER_H
 
 #include <cassert>
+#include <cstddef>
 #include <cstdint>
 
 #include "bant/util/arena.h"

bant/util/stat.h

@@ -20,6 +20,7 @@
 
 #include <cstddef>
 #include <optional>
+#include <ostream>
 #include <string>
 #include <string_view>
 
@@ -31,7 +32,7 @@ namespace bant {
 // Add time encountered in the scope to duration.
 class ScopedTimer {
  public:
-  ScopedTimer(absl::Duration *to_update)
+  explicit ScopedTimer(absl::Duration *to_update)
       : to_update_(to_update), start_(absl::Now()) {}
   ~ScopedTimer() { *to_update_ += absl::Now() - start_; }
 
@@ -41,7 +42,7 @@ class ScopedTimer {
 };
 
 struct Stat {
-  Stat(std::string_view subject) : subject(subject) {}
+  explicit Stat(std::string_view subject) : subject(subject) {}
   std::string_view subject;  // Descriptive name this stat is counting.
 
   int count = 0;