Skip to content

Commit

Permalink
Run clang include cleaner on //base
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 633597650
  • Loading branch information
@tomokinat @hiroyuki-komatsu
tomokinat authored and hiroyuki-komatsu committed May 14, 2024
1 parent e122f75 commit c10f47a
Show file tree
Hide file tree
Showing 84 changed files with 170 additions and 142 deletions.
75 changes: 46 additions & 29 deletions src/base/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ mozc_cc_library(
android = ["//base"],
client = [
":file_util",
":logging",
"@com_google_absl//absl/flags:parse",
],
default = ["//base"],
Expand All @@ -69,7 +68,6 @@ mozc_cc_library(
macos = ["//base"],
oss = [
":file_util",
":logging",
"@com_google_absl//absl/flags:parse",
],
windows = ["//base"],
Expand All @@ -88,7 +86,6 @@ mozc_cc_library(
android = ["//base"],
client = [
":file_util",
":logging",
":system_util",
"@com_google_absl//absl/flags:parse",
],
Expand All @@ -98,7 +95,6 @@ mozc_cc_library(
macos = ["//base"],
oss = [
":file_util",
":logging",
":system_util",
"@com_google_absl//absl/flags:parse",
],
Expand All @@ -116,7 +112,7 @@ mozc_cc_test(
srcs = ["port_test.cc"],
deps = [
":port",
"//testing:gunit_main",
"//testing:gunit_main", # buildcleaner: keep
],
)

Expand Down Expand Up @@ -157,9 +153,9 @@ mozc_cc_library(
srcs = ["vlog.cc"],
hdrs = ["vlog.h"],
deps = [
":logging",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:flags",
],
)
Expand Down Expand Up @@ -242,7 +238,8 @@ mozc_cc_library(
srcs = ["hash.cc"],
hdrs = ["hash.h"],
deps = [
":logging",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/strings",
],
)
Expand Down Expand Up @@ -301,7 +298,6 @@ mozc_cc_library(
"//:__subpackages__",
],
deps = [
":logging",
"//base/strings:unicode",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/base:core_headers",
Expand All @@ -325,9 +321,9 @@ mozc_cc_test(
"util_test.cc",
],
deps = [
":logging",
":util",
"//testing:gunit_main",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/strings",
],
)
Expand Down Expand Up @@ -389,7 +385,6 @@ mozc_cc_test(
srcs = ["text_normalizer_test.cc"],
deps = [
":text_normalizer",
":util",
"//testing:gunit_main",
],
)
Expand All @@ -402,7 +397,7 @@ mozc_cc_library(
visibility = ["//:__subpackages__"],
deps = [
":clock",
":logging",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/strings:string_view",
"@com_google_absl//absl/time",
],
Expand All @@ -413,6 +408,7 @@ mozc_cc_test(
size = "small",
srcs = ["clock_mock_test.cc"],
deps = [
":clock",
":clock_mock",
"//testing:gunit_main",
"@com_google_absl//absl/strings:string_view",
Expand All @@ -428,11 +424,11 @@ mozc_cc_library(
"//:__subpackages__",
],
deps = [
":logging",
":util",
"//base/strings:zstring_view",
"@com_google_absl//absl/base:core_headers",
"@com_google_absl//absl/cleanup",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
Expand Down Expand Up @@ -489,10 +485,10 @@ mozc_cc_library(
visibility = ["//:__subpackages__"],
deps = [
":file_stream",
":logging",
":mmap",
":port",
":singleton",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
Expand All @@ -513,6 +509,7 @@ mozc_cc_library(
":file_util",
"@com_google_absl//absl/container:btree",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings:str_format",
],
)
Expand All @@ -522,8 +519,10 @@ mozc_cc_test(
size = "small",
srcs = ["file_util_mock_test.cc"],
deps = [
":file_util",
":file_util_mock",
"//testing:gunit_main",
"@com_google_absl//absl/status:statusor",
],
)

Expand All @@ -534,7 +533,6 @@ mozc_cc_test(
tags = ["noandroid"], # TODO(b/73698251): disabled due to errors
deps = [
":file_util",
":logging",
":util",
"//base/file:temp_dir",
"//testing:gunit_main",
Expand Down Expand Up @@ -570,14 +568,15 @@ mozc_cc_library(
":const",
":environ",
":file_util",
":logging",
":singleton",
":util",
"//base/strings:zstring_view",
"//bazel/win32:aux_ulib", # win_util
"//bazel/win32:imm32",
"@com_google_absl//absl/base",
"@com_google_absl//absl/container:fixed_array",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
Expand All @@ -603,10 +602,10 @@ mozc_cc_test(
":file_util",
":file_util_mock",
":system_util",
":util",
"//testing:gunit_main",
] + mozc_select(android = [
"@com_google_absl//absl/strings",
],
]),
)

mozc_cc_library(
Expand All @@ -618,16 +617,16 @@ mozc_cc_library(
],
visibility = ["//:__subpackages__"],
deps = [
":const",
":file_util",
":logging",
":system_util",
":vlog",
"@com_google_absl//absl/log",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/time",
] + mozc_select(
macos = ["//base/mac:mac_process"],
windows = [
":const",
"//base/win32:wide_char",
"@com_microsoft_wil//:wil",
],
Expand All @@ -641,12 +640,12 @@ mozc_cc_library(
visibility = ["//:__subpackages__"],
deps = [
":file_util",
":logging",
":port",
":singleton",
":system_util",
":util",
":vlog",
"@com_google_absl//absl/log",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/synchronization",
] + mozc_select(
Expand All @@ -664,16 +663,28 @@ mozc_cc_library(
),
)

mozc_cc_binary(
name = "process_mutex_main",
srcs = ["process_mutex_main.cc"],
deps = [
":init_mozc",
":process_mutex",
"@com_google_absl//absl/flags:flag",
"@com_google_absl//absl/log",
"@com_google_absl//absl/time",
],
)

mozc_cc_test(
name = "process_mutex_test",
size = "small",
srcs = ["process_mutex_test.cc"],
deps = [
":file_util",
":logging",
":process_mutex",
"//testing:gunit_main",
"//testing:mozctest",
"@com_google_absl//absl/log",
"@com_google_absl//absl/status",
"@com_google_absl//absl/time",
],
Expand All @@ -688,7 +699,6 @@ mozc_cc_library(
visibility = ["//:__subpackages__"],
deps = [
":const",
":logging",
":system_util",
":util",
"@com_google_absl//absl/strings",
Expand Down Expand Up @@ -730,10 +740,11 @@ mozc_cc_library(
deps = [
":file_stream",
":file_util",
":logging",
":singleton",
":system_util",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
],
Expand All @@ -749,6 +760,7 @@ mozc_cc_test(
":system_util",
"//testing:gunit_main",
"//testing:mozctest",
"@com_google_absl//absl/strings:string_view",
],
)

Expand Down Expand Up @@ -800,9 +812,9 @@ mozc_cc_library(
":version_def_h",
],
deps = [
":logging",
":number_util",
":util",
"@com_google_absl//absl/log",
"@com_google_absl//absl/strings",
] + mozc_select(
windows = ["//base/win32:wide_char"],
Expand Down Expand Up @@ -837,7 +849,7 @@ mozc_cc_library(
],
deps = [
":bits",
":logging",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/numeric:bits",
"@com_google_absl//absl/strings",
],
Expand Down Expand Up @@ -874,7 +886,6 @@ mozc_cc_library(
":const",
":file_stream",
":file_util",
":logging",
":mmap",
":obfuscator_support",
":random",
Expand All @@ -883,7 +894,10 @@ mozc_cc_library(
":util",
"//bazel/win32:crypt32",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@com_google_absl//absl/synchronization",
Expand Down Expand Up @@ -918,7 +932,7 @@ mozc_cc_library(
srcs = ["cpu_stats.cc"],
hdrs = ["cpu_stats.h"],
visibility = ["//:__subpackages__"],
deps = [":logging"],
deps = ["@com_google_absl//absl/log"],
)

mozc_cc_test(
Expand Down Expand Up @@ -1010,7 +1024,7 @@ mozc_cc_library(
visibility = ["//:__subpackages__"],
deps = [
":file_stream",
":logging",
"@com_google_absl//absl/log",
"@com_google_absl//absl/strings",
],
)
Expand Down Expand Up @@ -1044,9 +1058,10 @@ mozc_cc_library(
deps = [
":const",
":file_util",
":logging",
":system_util",
":version",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
] + mozc_select(
windows = ["//base/win32:wide_char"],
),
Expand Down Expand Up @@ -1079,6 +1094,7 @@ mozc_cc_test(
":file_util",
"//testing:gunit_main",
"//testing:mozctest",
"@com_google_absl//absl/status:statusor",
],
)

Expand Down Expand Up @@ -1158,5 +1174,6 @@ mozc_cc_test(
":bits",
"//testing:gunit_main",
"@com_google_absl//absl/algorithm:container",
"@com_google_absl//absl/strings:string_view",
],
)
2 changes: 1 addition & 1 deletion src/base/android_util.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
#include <fstream>
#include <utility>

#include "absl/log/check.h"
#include "absl/synchronization/mutex.h"
#include "base/logging.h"
#include "base/util.h"

namespace {
Expand Down
1 change: 1 addition & 0 deletions src/base/bits.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#ifndef MOZC_BASE_BITS_H_
#define MOZC_BASE_BITS_H_

#include <cstddef>
#include <cstdint>
#include <cstring>
#include <iterator>
Expand Down
3 changes: 3 additions & 0 deletions src/base/bits_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@

#include "base/bits.h"

#include <cstdint>
#include <iterator>
#include <string>
#include <vector>

#include "absl/algorithm/container.h"
#include "absl/strings/string_view.h"
#include "testing/gmock.h"
#include "testing/gunit.h"

Expand Down

0 comments on commit c10f47a

Please sign in to comment.