Skip to content

Commit 44b5475

Browse files
authored
impl(v3): delete absl quiet headers (googleapis#15897)
1 parent c083ccf commit 44b5475

911 files changed

Lines changed: 1318 additions & 1094 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ci/cloudbuild/builds/checkers.sh

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,19 +94,6 @@ time {
9494
xargs -r -P "$(nproc)" -n 50 -0 awk -f "ci/check-include-guards.gawk"
9595
}
9696

97-
# TODO(#4501) - this fixup can be removed if #include <absl/...> works
98-
# Apply transformations to fix errors on MSVC+x86. See the bug for a detailed
99-
# explanation as to why this is needed:
100-
# https://github.com/googleapis/google-cloud-cpp/issues/4501
101-
# This should run before clang-format because it might alter the order of any
102-
# includes.
103-
printf "%-50s" "Running Abseil header fixes:" >&2
104-
time {
105-
expressions=("-e" "'s;#include \"absl/strings/str_\(cat\|replace\|join\).h\";#include \"google/cloud/internal/absl_str_\1_quiet.h\";'")
106-
(git grep -zEl '#include "absl/strings/str_(cat|replace|join).h"' -- '*.h' '*.cc' ':!google/cloud/internal/absl_str_*quiet.h' || true) |
107-
xargs -r -P "$(nproc)" -n 50 -0 bash -c "sed_edit ${expressions[*]} \"\$0\" \"\$@\""
108-
}
109-
11097
# Apply several transformations that cannot be enforced by clang-format:
11198
# - Replace any #include for grpc++/* with grpcpp/*. The paths with grpc++
11299
# are obsoleted by the gRPC team, so we should not use them in our code.

generator/generator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include "generator/internal/descriptor_utils.h"
1818
#include "generator/internal/generator_interface.h"
1919
#include "generator/internal/make_generators.h"
20-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2120
#include "google/cloud/internal/algorithm.h"
2221
#include "google/cloud/internal/filesystem.h"
2322
#include "google/cloud/status_or.h"
23+
#include "absl/strings/str_cat.h"
2424
#include "absl/strings/str_split.h"
2525
#include "google/api/client.pb.h"
2626
#include <future>

generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
// source: generator/integration_tests/test_deprecated.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/deprecated_metadata_decorator.h"
20+
#include "absl/strings/str_cat.h"
21+
#include "absl/strings/str_join.h"
2022
#include "google/cloud/grpc_options.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2223
#include "google/cloud/internal/api_client_header.h"
2324
#include "google/cloud/internal/url_encode.h"
2425
#include "google/cloud/status_or.h"

generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
// source: generator/integration_tests/test_deprecated.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_metadata_decorator.h"
20+
#include "absl/strings/str_cat.h"
2021
#include "absl/strings/str_format.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2222
#include "google/cloud/internal/api_client_header.h"
2323
#include "google/cloud/internal/rest_set_metadata.h"
2424
#include "google/cloud/status_or.h"

generator/integration_tests/golden/v1/internal/deprecated_rest_stub.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
// source: generator/integration_tests/test_deprecated.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/deprecated_rest_stub.h"
20+
#include "absl/strings/str_cat.h"
2021
#include "google/cloud/common_options.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2222
#include "google/cloud/internal/rest_stub_helpers.h"
2323
#include "google/cloud/status_or.h"
2424
#include "generator/integration_tests/test_deprecated.pb.h"

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
// source: generator/integration_tests/test.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_metadata_decorator.h"
20+
#include "absl/strings/str_cat.h"
21+
#include "absl/strings/str_join.h"
2022
#include "google/cloud/grpc_options.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
22-
#include "google/cloud/internal/absl_str_join_quiet.h"
2323
#include "google/cloud/internal/api_client_header.h"
2424
#include "google/cloud/internal/routing_matcher.h"
2525
#include "google/cloud/internal/url_encode.h"

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
// source: generator/integration_tests/test.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_metadata_decorator.h"
20+
#include "absl/strings/str_cat.h"
2021
#include "absl/strings/str_format.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2222
#include "google/cloud/internal/api_client_header.h"
2323
#include "google/cloud/internal/rest_set_metadata.h"
2424
#include "google/cloud/internal/routing_matcher.h"

generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
// source: generator/integration_tests/test.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/golden_kitchen_sink_rest_stub.h"
20+
#include "absl/strings/str_cat.h"
2021
#include "google/cloud/common_options.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2222
#include "google/cloud/internal/rest_stub_helpers.h"
2323
#include "google/cloud/status_or.h"
2424
#include "generator/integration_tests/test.pb.h"

generator/integration_tests/golden/v1/internal/golden_rest_only_option_defaults.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "generator/integration_tests/golden/v1/golden_rest_only_options.h"
2222
#include "google/cloud/internal/populate_common_options.h"
2323
#include "google/cloud/internal/populate_grpc_options.h"
24-
#include "google/cloud/internal/absl_str_cat_quiet.h"
24+
#include "absl/strings/str_cat.h"
2525
#include <memory>
2626
#include <utility>
2727

generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
// source: generator/integration_tests/test2.proto
1818

1919
#include "generator/integration_tests/golden/v1/internal/golden_rest_only_rest_metadata_decorator.h"
20+
#include "absl/strings/str_cat.h"
2021
#include "absl/strings/str_format.h"
21-
#include "google/cloud/internal/absl_str_cat_quiet.h"
2222
#include "google/cloud/internal/api_client_header.h"
2323
#include "google/cloud/internal/rest_set_metadata.h"
2424
#include "google/cloud/status_or.h"

0 commit comments

Comments
 (0)