From e7fb03d8aa1bb0d3ad8b85f0817f3127f3a1cc25 Mon Sep 17 00:00:00 2001 From: "Mark D. Roth" Date: Fri, 31 May 2024 20:53:29 +0000 Subject: [PATCH] move matchers --- CMakeLists.txt | 4 ++-- Makefile | 2 +- Package.swift | 4 ++-- build_autogenerated.yaml | 8 ++++---- config.m4 | 4 ++-- gRPC-C++.podspec | 4 ++-- gRPC-Core.podspec | 6 +++--- grpc.gemspec | 4 ++-- grpc.gyp | 4 ++-- package.xml | 4 ++-- src/core/BUILD | 4 ++-- src/core/ext/filters/rbac/rbac_service_config_parser.cc | 2 +- src/core/lib/security/authorization/matchers.h | 2 +- src/core/lib/security/authorization/rbac_policy.h | 2 +- src/core/lib/security/authorization/rbac_translator.cc | 2 +- src/core/lib/security/credentials/xds/xds_credentials.h | 2 +- src/core/{lib/matchers => util}/matchers.cc | 2 +- src/core/{lib/matchers => util}/matchers.h | 6 +++--- src/core/xds/grpc/xds_certificate_provider.h | 2 +- src/core/xds/grpc/xds_cluster.cc | 2 +- src/core/xds/grpc/xds_common_types.h | 2 +- src/core/xds/grpc/xds_listener.cc | 2 +- src/core/xds/grpc/xds_route_config.cc | 2 +- src/core/xds/grpc/xds_route_config.h | 2 +- src/core/xds/grpc/xds_routing.cc | 2 +- src/python/grpcio/grpc_core_dependencies.py | 2 +- test/core/matchers/matchers_test.cc | 2 +- test/core/xds/xds_common_types_test.cc | 2 +- test/core/xds/xds_route_config_resource_type_test.cc | 2 +- tools/doxygen/Doxyfile.c++.internal | 4 ++-- tools/doxygen/Doxyfile.core.internal | 4 ++-- 31 files changed, 48 insertions(+), 48 deletions(-) rename src/core/{lib/matchers => util}/matchers.cc (99%) rename src/core/{lib/matchers => util}/matchers.h (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index eaf9eb3ec46..c0fc16c48ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2392,7 +2392,7 @@ add_library(grpc src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/matchers/matchers.cc + src/core/util/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/sleep.cc @@ -5304,7 +5304,7 @@ add_library(grpc_authorization_provider src/core/lib/iomgr/wakeup_fd_nospecial.cc src/core/lib/iomgr/wakeup_fd_pipe.cc src/core/lib/iomgr/wakeup_fd_posix.cc - src/core/lib/matchers/matchers.cc + src/core/util/matchers.cc src/core/lib/promise/activity.cc src/core/lib/promise/party.cc src/core/lib/promise/trace.cc diff --git a/Makefile b/Makefile index c7f628fcc3b..672394a21c3 100644 --- a/Makefile +++ b/Makefile @@ -1242,7 +1242,7 @@ LIBGRPC_SRC = \ src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/lib/matchers/matchers.cc \ + src/core/util/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ diff --git a/Package.swift b/Package.swift index f204f05a2ef..7a81064c64f 100644 --- a/Package.swift +++ b/Package.swift @@ -1464,8 +1464,8 @@ let package = Package( "src/core/lib/iomgr/wakeup_fd_pipe.h", "src/core/lib/iomgr/wakeup_fd_posix.cc", "src/core/lib/iomgr/wakeup_fd_posix.h", - "src/core/lib/matchers/matchers.cc", - "src/core/lib/matchers/matchers.h", + "src/core/util/matchers.cc", + "src/core/util/matchers.h", "src/core/lib/promise/activity.cc", "src/core/lib/promise/activity.h", "src/core/lib/promise/all_ok.h", diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index d98e2d4da38..25e59efc1e4 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -974,7 +974,7 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/matchers/matchers.h + - src/core/util/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -1808,7 +1808,7 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/lib/matchers/matchers.cc + - src/core/util/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/sleep.cc @@ -4610,7 +4610,7 @@ libs: - src/core/lib/iomgr/vsock.h - src/core/lib/iomgr/wakeup_fd_pipe.h - src/core/lib/iomgr/wakeup_fd_posix.h - - src/core/lib/matchers/matchers.h + - src/core/util/matchers.h - src/core/lib/promise/activity.h - src/core/lib/promise/all_ok.h - src/core/lib/promise/arena_promise.h @@ -4935,7 +4935,7 @@ libs: - src/core/lib/iomgr/wakeup_fd_nospecial.cc - src/core/lib/iomgr/wakeup_fd_pipe.cc - src/core/lib/iomgr/wakeup_fd_posix.cc - - src/core/lib/matchers/matchers.cc + - src/core/util/matchers.cc - src/core/lib/promise/activity.cc - src/core/lib/promise/party.cc - src/core/lib/promise/trace.cc diff --git a/config.m4 b/config.m4 index 75f3b481fb8..4a87cc5902e 100644 --- a/config.m4 +++ b/config.m4 @@ -617,7 +617,7 @@ if test "$PHP_GRPC" != "no"; then src/core/lib/iomgr/wakeup_fd_nospecial.cc \ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_posix.cc \ - src/core/lib/matchers/matchers.cc \ + src/core/util/matchers.cc \ src/core/lib/promise/activity.cc \ src/core/lib/promise/party.cc \ src/core/lib/promise/sleep.cc \ @@ -1536,7 +1536,7 @@ if test "$PHP_GRPC" != "no"; then PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/gprpp/windows) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/iomgr/event_engine_shims) - PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/matchers) + PHP_ADD_BUILD_DIR($ext_builddir/src/core/util) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/promise) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/resource_quota) PHP_ADD_BUILD_DIR($ext_builddir/src/core/lib/security/authorization) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 15e1d3dbd39..de21c36905e 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -1072,7 +1072,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', + 'src/core/util/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', @@ -2347,7 +2347,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', + 'src/core/util/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index ab776e2c38c..49ac1c8c65c 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -1583,8 +1583,8 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.cc', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.cc', - 'src/core/lib/matchers/matchers.h', + 'src/core/util/matchers.cc', + 'src/core/util/matchers.h', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', @@ -3130,7 +3130,7 @@ Pod::Spec.new do |s| 'src/core/lib/iomgr/vsock.h', 'src/core/lib/iomgr/wakeup_fd_pipe.h', 'src/core/lib/iomgr/wakeup_fd_posix.h', - 'src/core/lib/matchers/matchers.h', + 'src/core/util/matchers.h', 'src/core/lib/promise/activity.h', 'src/core/lib/promise/all_ok.h', 'src/core/lib/promise/arena_promise.h', diff --git a/grpc.gemspec b/grpc.gemspec index dfa4b6fc3e6..4d1fd59ecea 100644 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -1470,8 +1470,8 @@ Gem::Specification.new do |s| s.files += %w( src/core/lib/iomgr/wakeup_fd_pipe.h ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.cc ) s.files += %w( src/core/lib/iomgr/wakeup_fd_posix.h ) - s.files += %w( src/core/lib/matchers/matchers.cc ) - s.files += %w( src/core/lib/matchers/matchers.h ) + s.files += %w( src/core/util/matchers.cc ) + s.files += %w( src/core/util/matchers.h ) s.files += %w( src/core/lib/promise/activity.cc ) s.files += %w( src/core/lib/promise/activity.h ) s.files += %w( src/core/lib/promise/all_ok.h ) diff --git a/grpc.gyp b/grpc.gyp index f26cd97b283..f5ae1916069 100644 --- a/grpc.gyp +++ b/grpc.gyp @@ -864,7 +864,7 @@ 'src/core/lib/json/json_reader.cc', 'src/core/lib/json/json_util.cc', 'src/core/lib/json/json_writer.cc', - 'src/core/lib/matchers/matchers.cc', + 'src/core/util/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/sleep.cc', @@ -2208,7 +2208,7 @@ 'src/core/lib/iomgr/wakeup_fd_posix.cc', 'src/core/lib/json/json_reader.cc', 'src/core/lib/json/json_writer.cc', - 'src/core/lib/matchers/matchers.cc', + 'src/core/util/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/trace.cc', diff --git a/package.xml b/package.xml index 00e17d4eb7c..bda10cae2af 100644 --- a/package.xml +++ b/package.xml @@ -1452,8 +1452,8 @@ - - + + diff --git a/src/core/BUILD b/src/core/BUILD index a91c945aa20..7f967981c5a 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -4471,10 +4471,10 @@ grpc_cc_library( grpc_cc_library( name = "grpc_matchers", srcs = [ - "lib/matchers/matchers.cc", + "util/matchers.cc", ], hdrs = [ - "lib/matchers/matchers.h", + "util/matchers.h", ], external_deps = [ "absl/status", diff --git a/src/core/ext/filters/rbac/rbac_service_config_parser.cc b/src/core/ext/filters/rbac/rbac_service_config_parser.cc index 000440f5274..1c54e0fa42c 100644 --- a/src/core/ext/filters/rbac/rbac_service_config_parser.cc +++ b/src/core/ext/filters/rbac/rbac_service_config_parser.cc @@ -31,7 +31,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json_args.h" #include "src/core/util/json/json_object_loader.h" diff --git a/src/core/lib/security/authorization/matchers.h b/src/core/lib/security/authorization/matchers.h index 354d7c0cb3e..f26b4412872 100644 --- a/src/core/lib/security/authorization/matchers.h +++ b/src/core/lib/security/authorization/matchers.h @@ -26,7 +26,7 @@ #include #include "src/core/lib/iomgr/resolved_address.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/lib/security/authorization/evaluate_args.h" #include "src/core/lib/security/authorization/rbac_policy.h" diff --git a/src/core/lib/security/authorization/rbac_policy.h b/src/core/lib/security/authorization/rbac_policy.h index b3a2c6db6aa..03b4e283cde 100644 --- a/src/core/lib/security/authorization/rbac_policy.h +++ b/src/core/lib/security/authorization/rbac_policy.h @@ -27,7 +27,7 @@ #include #include -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" namespace grpc_core { diff --git a/src/core/lib/security/authorization/rbac_translator.cc b/src/core/lib/security/authorization/rbac_translator.cc index 1dbbe8bf16d..c99daeb7340 100644 --- a/src/core/lib/security/authorization/rbac_translator.cc +++ b/src/core/lib/security/authorization/rbac_translator.cc @@ -37,7 +37,7 @@ #include #include -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/lib/security/authorization/audit_logging.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_reader.h" diff --git a/src/core/lib/security/credentials/xds/xds_credentials.h b/src/core/lib/security/credentials/xds/xds_credentials.h index dc363ac52b2..85d80a2983b 100644 --- a/src/core/lib/security/credentials/xds/xds_credentials.h +++ b/src/core/lib/security/credentials/xds/xds_credentials.h @@ -36,7 +36,7 @@ #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_verifier.h" #include "src/core/lib/security/security_connector/security_connector.h" diff --git a/src/core/lib/matchers/matchers.cc b/src/core/util/matchers.cc similarity index 99% rename from src/core/lib/matchers/matchers.cc rename to src/core/util/matchers.cc index 38bea23b2b5..d5da0c0a54b 100644 --- a/src/core/lib/matchers/matchers.cc +++ b/src/core/util/matchers.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include diff --git a/src/core/lib/matchers/matchers.h b/src/core/util/matchers.h similarity index 97% rename from src/core/lib/matchers/matchers.h rename to src/core/util/matchers.h index b2055778ff7..03b9b81813d 100644 --- a/src/core/lib/matchers/matchers.h +++ b/src/core/util/matchers.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H -#define GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H +#ifndef GRPC_SRC_CORE_UTIL_MATCHERS_H +#define GRPC_SRC_CORE_UTIL_MATCHERS_H #include @@ -160,4 +160,4 @@ class HeaderMatcher { } // namespace grpc_core -#endif // GRPC_SRC_CORE_LIB_MATCHERS_MATCHERS_H +#endif // GRPC_SRC_CORE_UTIL_MATCHERS_H diff --git a/src/core/xds/grpc/xds_certificate_provider.h b/src/core/xds/grpc/xds_certificate_provider.h index 14747d99c14..c86f0b5fcd0 100644 --- a/src/core/xds/grpc/xds_certificate_provider.h +++ b/src/core/xds/grpc/xds_certificate_provider.h @@ -34,7 +34,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/sync.h" #include "src/core/lib/gprpp/unique_type_name.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h" #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h" #include "src/core/util/useful.h" diff --git a/src/core/xds/grpc/xds_cluster.cc b/src/core/xds/grpc/xds_cluster.cc index d7ad16ae66c..0bad9c7b4d7 100644 --- a/src/core/xds/grpc/xds_cluster.cc +++ b/src/core/xds/grpc/xds_cluster.cc @@ -63,7 +63,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/upb_utils.h" diff --git a/src/core/xds/grpc/xds_common_types.h b/src/core/xds/grpc/xds_common_types.h index 1285e08f936..29433cf6952 100644 --- a/src/core/xds/grpc/xds_common_types.h +++ b/src/core/xds/grpc/xds_common_types.h @@ -31,7 +31,7 @@ #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/util/json/json.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_listener.cc b/src/core/xds/grpc/xds_listener.cc index c071fd9882c..64a618251fd 100644 --- a/src/core/xds/grpc/xds_listener.cc +++ b/src/core/xds/grpc/xds_listener.cc @@ -54,7 +54,7 @@ #include "src/core/lib/gprpp/match.h" #include "src/core/lib/gprpp/validation_errors.h" #include "src/core/lib/iomgr/sockaddr.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_common_types.h" #include "src/core/xds/xds_client/xds_resource_type.h" diff --git a/src/core/xds/grpc/xds_route_config.cc b/src/core/xds/grpc/xds_route_config.cc index c3ab477ac88..9813ff62f2e 100644 --- a/src/core/xds/grpc/xds_route_config.cc +++ b/src/core/xds/grpc/xds_route_config.cc @@ -65,7 +65,7 @@ #include "src/core/lib/gprpp/match.h" #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/load_balancing/lb_policy_registry.h" #include "src/core/util/json/json.h" #include "src/core/util/json/json_writer.h" diff --git a/src/core/xds/grpc/xds_route_config.h b/src/core/xds/grpc/xds_route_config.h index f6d802aa91e..873adf16fc9 100644 --- a/src/core/xds/grpc/xds_route_config.h +++ b/src/core/xds/grpc/xds_route_config.h @@ -38,7 +38,7 @@ #include "src/core/lib/channel/status_util.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h" #include "src/core/xds/grpc/xds_http_filters.h" diff --git a/src/core/xds/grpc/xds_routing.cc b/src/core/xds/grpc/xds_routing.cc index eadbe762286..0940814a411 100644 --- a/src/core/xds/grpc/xds_routing.cc +++ b/src/core/xds/grpc/xds_routing.cc @@ -35,7 +35,7 @@ #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/xds/grpc/xds_http_filters.h" namespace grpc_core { diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index b58af0dca01..59d00682394 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -591,7 +591,7 @@ CORE_SOURCE_FILES = [ 'src/core/lib/iomgr/wakeup_fd_nospecial.cc', 'src/core/lib/iomgr/wakeup_fd_pipe.cc', 'src/core/lib/iomgr/wakeup_fd_posix.cc', - 'src/core/lib/matchers/matchers.cc', + 'src/core/util/matchers.cc', 'src/core/lib/promise/activity.cc', 'src/core/lib/promise/party.cc', 'src/core/lib/promise/sleep.cc', diff --git a/test/core/matchers/matchers_test.cc b/test/core/matchers/matchers_test.cc index 75c6b498886..d772dcbcfbe 100644 --- a/test/core/matchers/matchers_test.cc +++ b/test/core/matchers/matchers_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "absl/status/status.h" #include "gtest/gtest.h" diff --git a/test/core/xds/xds_common_types_test.cc b/test/core/xds/xds_common_types_test.cc index a83514a89a7..cefbb4f30bd 100644 --- a/test/core/xds/xds_common_types_test.cc +++ b/test/core/xds/xds_common_types_test.cc @@ -43,7 +43,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/gprpp/validation_errors.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/upb_utils.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc index d28889e61bb..ea59d519333 100644 --- a/test/core/xds/xds_route_config_resource_type_test.cc +++ b/test/core/xds/xds_route_config_resource_type_test.cc @@ -49,7 +49,7 @@ #include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/gprpp/time.h" #include "src/core/lib/iomgr/error.h" -#include "src/core/lib/matchers/matchers.h" +#include "src/core/util/matchers.h" #include "src/core/util/json/json_writer.h" #include "src/core/xds/grpc/xds_bootstrap_grpc.h" #include "src/core/xds/grpc/xds_route_config.h" diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index b23a984d22e..970f3f6136b 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -2469,8 +2469,8 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/lib/matchers/matchers.cc \ -src/core/lib/matchers/matchers.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index e49ef2a9e71..23735d32d0d 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -2243,8 +2243,8 @@ src/core/lib/iomgr/wakeup_fd_pipe.cc \ src/core/lib/iomgr/wakeup_fd_pipe.h \ src/core/lib/iomgr/wakeup_fd_posix.cc \ src/core/lib/iomgr/wakeup_fd_posix.h \ -src/core/lib/matchers/matchers.cc \ -src/core/lib/matchers/matchers.h \ +src/core/util/matchers.cc \ +src/core/util/matchers.h \ src/core/lib/promise/activity.cc \ src/core/lib/promise/activity.h \ src/core/lib/promise/all_ok.h \