Skip to content

Commit e004844

Browse files
committed
Enable include-cleaner for cuttlefish/pretty
This change adds a .clang-tidy symlink to cuttlefish/pretty that enables misc-include-cleaner, registers it in BUILD.bazel, and fixes the resulting lint errors. Bug: b/523396865 Assisted-by: Jetski:GeminiNext
1 parent 3825035 commit e004844

13 files changed

Lines changed: 30 additions & 15 deletions

File tree

base/cvd/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ filegroup(
2727
name = "clang_tidy_config",
2828
srcs = [
2929
".clang-tidy",
30-
"//cuttlefish/io:.clang-tidy",
3130
"//cuttlefish/common/libs/key_equals_value:.clang-tidy",
3231
"//cuttlefish/flag_parser:.clang-tidy",
3332
"//cuttlefish/host/commands/assemble_cvd/android_build:.clang-tidy",
@@ -40,6 +39,8 @@ filegroup(
4039
"//cuttlefish/host/libs/web:.clang-tidy",
4140
"//cuttlefish/host/libs/zip:.clang-tidy",
4241
"//cuttlefish/host/libs/zip/libzip_cc:.clang-tidy",
42+
"//cuttlefish/io:.clang-tidy",
43+
"//cuttlefish/pretty:.clang-tidy",
4344
],
4445
)
4546

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../clang_tidy_configs/with_include_cleaner

base/cvd/cuttlefish/pretty/BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ package(
44
default_visibility = ["//:android_cuttlefish"],
55
)
66

7+
exports_files([".clang-tidy"])
8+
79
cf_cc_library(
810
name = "container",
911
srcs = ["container.cc"],

base/cvd/cuttlefish/pretty/container.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include <string_view>
2121
#include <vector>
2222

23+
#include "absl/strings/str_cat.h"
24+
#include "absl/strings/str_format.h"
2325
#include "absl/strings/str_replace.h"
2426

2527
namespace cuttlefish {

base/cvd/cuttlefish/pretty/container_test.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616

1717
#include "cuttlefish/pretty/container.h"
1818

19+
#include <sstream>
1920
#include <string_view>
2021
#include <vector>
2122

2223
#include "absl/strings/ascii.h"
24+
#include "absl/strings/str_cat.h"
2325
#include "fmt/format.h"
2426
#include "gtest/gtest.h"
2527

base/cvd/cuttlefish/pretty/json.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
#include "cuttlefish/pretty/json.h"
1717

18+
#include <string>
19+
1820
#include "json/value.h"
1921
#include "json/writer.h"
2022

base/cvd/cuttlefish/pretty/json_test.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
#include "cuttlefish/pretty/json.h"
1818

19+
#include <string>
20+
1921
#include "absl/strings/match.h"
2022
#include "gtest/gtest.h"
2123
#include "json/value.h"

base/cvd/cuttlefish/pretty/liblp/builder.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
#include "liblp/builder.h"
1919

2020
#include "cuttlefish/pretty/pretty.h"
21-
#include "cuttlefish/pretty/string.h"
2221
#include "cuttlefish/pretty/struct.h"
23-
#include "cuttlefish/pretty/unique_ptr.h"
24-
#include "cuttlefish/pretty/vector.h"
22+
#include "cuttlefish/pretty/unique_ptr.h" // IWYU pragma: keep
23+
#include "cuttlefish/pretty/vector.h" // IWYU pragma: keep
2524

2625
namespace cuttlefish {
2726

base/cvd/cuttlefish/pretty/liblp/liblp.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
#include "liblp/liblp.h"
1919

20-
#include "cuttlefish/pretty/liblp/metadata_format.h"
20+
#include "cuttlefish/pretty/liblp/metadata_format.h" // IWYU pragma: keep
2121
#include "cuttlefish/pretty/pretty.h"
2222
#include "cuttlefish/pretty/struct.h"
23-
#include "cuttlefish/pretty/vector.h"
23+
#include "cuttlefish/pretty/vector.h" // IWYU pragma: keep
2424

2525
namespace cuttlefish {
2626

base/cvd/cuttlefish/pretty/liblp/metadata_format.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515

1616
#include "cuttlefish/pretty/liblp/metadata_format.h"
1717

18+
#include <cstdint>
19+
#include <vector>
20+
1821
#include "liblp/liblp.h"
1922
#include "liblp/metadata_format.h"
2023

2124
#include "cuttlefish/pretty/pretty.h"
22-
#include "cuttlefish/pretty/string.h"
2325
#include "cuttlefish/pretty/struct.h"
24-
#include "cuttlefish/pretty/vector.h"
26+
#include "cuttlefish/pretty/vector.h" // IWYU pragma: keep
2527

2628
namespace cuttlefish {
2729
namespace {

0 commit comments

Comments
 (0)