Skip to content

Commit dd775a5

Browse files
committed
Enable include-cleaner for cuttlefish/result
Created a .clang-tidy symlink in cuttlefish/result pointing to the with_include_cleaner configuration, and registered it. Fixed misc-include-cleaner violations in error_type and result_test. Bug: b/523396865 Assisted-by: Jetski:GeminiNext TAG=agy CONV=663b0ad6-9f8a-4795-adf9-ba651ce25607
1 parent 825cc27 commit dd775a5

6 files changed

Lines changed: 11 additions & 7 deletions

File tree

base/cvd/BUILD.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ filegroup(
2727
name = "clang_tidy_config",
2828
srcs = [
2929
".clang-tidy",
30-
"//cuttlefish/io:.clang-tidy",
31-
"//cuttlefish/posix:.clang-tidy",
3230
"//cuttlefish/common/libs/key_equals_value:.clang-tidy",
3331
"//cuttlefish/flag_parser:.clang-tidy",
3432
"//cuttlefish/host/commands/assemble_cvd/android_build:.clang-tidy",
@@ -41,6 +39,9 @@ filegroup(
4139
"//cuttlefish/host/libs/web:.clang-tidy",
4240
"//cuttlefish/host/libs/zip:.clang-tidy",
4341
"//cuttlefish/host/libs/zip/libzip_cc:.clang-tidy",
42+
"//cuttlefish/io:.clang-tidy",
43+
"//cuttlefish/posix:.clang-tidy",
44+
"//cuttlefish/result:.clang-tidy",
4445
],
4546
)
4647

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/result/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 = "error_type",
911
srcs = ["error_type.cc"],

base/cvd/cuttlefish/result/error_type.cc

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

1616
#include "cuttlefish/result/error_type.h"
1717

18+
#include <cstddef>
19+
#include <cstdlib>
1820
#include <optional>
1921
#include <ostream>
2022
#include <sstream>
2123
#include <string>
2224
#include <utility>
2325
#include <vector>
2426

25-
#include "android-base/format.h"
26-
#include "android-base/result.h"
27+
#include "fmt/base.h"
2728

2829
namespace cuttlefish {
2930

base/cvd/cuttlefish/result/error_type.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include <utility>
2525
#include <vector>
2626

27-
#include "android-base/format.h" // IWYU pragma: export
28-
#include "android-base/result.h" // IWYU pragma: export
27+
#include "android-base/expected.h" // IWYU pragma: export
28+
#include "fmt/core.h" // IWYU pragma: export
2929

3030
namespace cuttlefish {
3131

base/cvd/cuttlefish/result/result_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include <string>
2020

21-
#include "android-base/expected.h"
2221
#include "gmock/gmock.h"
2322
#include "gtest/gtest.h"
2423

0 commit comments

Comments
 (0)