From dfe9ffd3692d4761e730eb11d433e5933f241deb Mon Sep 17 00:00:00 2001 From: Boaz Brickner Date: Tue, 16 Sep 2025 19:22:03 +0200 Subject: [PATCH] Rename `check/import_cpp.*` to `check/cpp_import.*` to group C++ interop logic in `check` (#6074) See #6065 for context. --- toolchain/check/BUILD | 4 ++-- toolchain/check/check.cpp | 2 +- toolchain/check/check_unit.cpp | 2 +- toolchain/check/{import_cpp.cpp => cpp_import.cpp} | 2 +- toolchain/check/{import_cpp.h => cpp_import.h} | 6 +++--- toolchain/check/cpp_overload_resolution.cpp | 2 +- toolchain/check/name_lookup.cpp | 2 +- toolchain/check/operator.cpp | 2 +- toolchain/check/type_completion.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename toolchain/check/{import_cpp.cpp => cpp_import.cpp} (99%) rename toolchain/check/{import_cpp.h => cpp_import.h} (95%) diff --git a/toolchain/check/BUILD b/toolchain/check/BUILD index 60b9f76c70a0..8f83c1337e8e 100644 --- a/toolchain/check/BUILD +++ b/toolchain/check/BUILD @@ -22,6 +22,7 @@ cc_library( "control_flow.cpp", "convert.cpp", "cpp_custom_type_mapping.cpp", + "cpp_import.cpp", "cpp_overload_resolution.cpp", "cpp_thunk.cpp", "cpp_type_mapping.cpp", @@ -39,7 +40,6 @@ cc_library( "impl_validation.cpp", "implicit_type_impls.cpp", "import.cpp", - "import_cpp.cpp", "import_ref.cpp", "inst.cpp", "inst_block_stack.cpp", @@ -71,6 +71,7 @@ cc_library( "control_flow.h", "convert.h", "cpp_custom_type_mapping.h", + "cpp_import.h", "cpp_overload_resolution.h", "cpp_thunk.h", "cpp_type_mapping.h", @@ -90,7 +91,6 @@ cc_library( "impl_validation.h", "implicit_type_impls.h", "import.h", - "import_cpp.h", "import_ref.h", "inst.h", "inst_block_stack.h", diff --git a/toolchain/check/check.cpp b/toolchain/check/check.cpp index 1c1d4749a489..d7b2cf393b85 100644 --- a/toolchain/check/check.cpp +++ b/toolchain/check/check.cpp @@ -11,9 +11,9 @@ #include "common/map.h" #include "toolchain/check/check_unit.h" #include "toolchain/check/context.h" +#include "toolchain/check/cpp_import.h" #include "toolchain/check/diagnostic_emitter.h" #include "toolchain/check/diagnostic_helpers.h" -#include "toolchain/check/import_cpp.h" #include "toolchain/diagnostics/diagnostic.h" #include "toolchain/diagnostics/diagnostic_consumer.h" #include "toolchain/diagnostics/format_providers.h" diff --git a/toolchain/check/check_unit.cpp b/toolchain/check/check_unit.cpp index 32f1436934f3..53834ba5d36e 100644 --- a/toolchain/check/check_unit.cpp +++ b/toolchain/check/check_unit.cpp @@ -16,6 +16,7 @@ #include "llvm/Support/VirtualFileSystem.h" #include "toolchain/base/fixed_size_value_store.h" #include "toolchain/base/kind_switch.h" +#include "toolchain/check/cpp_import.h" #include "toolchain/check/diagnostic_helpers.h" #include "toolchain/check/generic.h" #include "toolchain/check/handle.h" @@ -23,7 +24,6 @@ #include "toolchain/check/impl_lookup.h" #include "toolchain/check/impl_validation.h" #include "toolchain/check/import.h" -#include "toolchain/check/import_cpp.h" #include "toolchain/check/import_ref.h" #include "toolchain/check/inst.h" #include "toolchain/check/node_id_traversal.h" diff --git a/toolchain/check/import_cpp.cpp b/toolchain/check/cpp_import.cpp similarity index 99% rename from toolchain/check/import_cpp.cpp rename to toolchain/check/cpp_import.cpp index e654e306f41b..cf995890863b 100644 --- a/toolchain/check/import_cpp.cpp +++ b/toolchain/check/cpp_import.cpp @@ -2,7 +2,7 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/check/import_cpp.h" +#include "toolchain/check/cpp_import.h" #include #include diff --git a/toolchain/check/import_cpp.h b/toolchain/check/cpp_import.h similarity index 95% rename from toolchain/check/import_cpp.h rename to toolchain/check/cpp_import.h index be9aeb77474a..e64dab8f4b04 100644 --- a/toolchain/check/import_cpp.h +++ b/toolchain/check/cpp_import.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_CHECK_IMPORT_CPP_H_ -#define CARBON_TOOLCHAIN_CHECK_IMPORT_CPP_H_ +#ifndef CARBON_TOOLCHAIN_CHECK_CPP_IMPORT_H_ +#define CARBON_TOOLCHAIN_CHECK_CPP_IMPORT_H_ #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/IntrusiveRefCntPtr.h" @@ -55,4 +55,4 @@ auto ImportClassDefinitionForClangDecl(Context& context, SemIR::LocId loc_id, } // namespace Carbon::Check -#endif // CARBON_TOOLCHAIN_CHECK_IMPORT_CPP_H_ +#endif // CARBON_TOOLCHAIN_CHECK_CPP_IMPORT_H_ diff --git a/toolchain/check/cpp_overload_resolution.cpp b/toolchain/check/cpp_overload_resolution.cpp index 6e184061c062..5a4add146fc5 100644 --- a/toolchain/check/cpp_overload_resolution.cpp +++ b/toolchain/check/cpp_overload_resolution.cpp @@ -6,8 +6,8 @@ #include "clang/Sema/Overload.h" #include "clang/Sema/Sema.h" +#include "toolchain/check/cpp_import.h" #include "toolchain/check/cpp_type_mapping.h" -#include "toolchain/check/import_cpp.h" namespace Carbon::Check { diff --git a/toolchain/check/name_lookup.cpp b/toolchain/check/name_lookup.cpp index 64b5bfd7dae3..c12bcf57b910 100644 --- a/toolchain/check/name_lookup.cpp +++ b/toolchain/check/name_lookup.cpp @@ -6,9 +6,9 @@ #include +#include "toolchain/check/cpp_import.h" #include "toolchain/check/generic.h" #include "toolchain/check/import.h" -#include "toolchain/check/import_cpp.h" #include "toolchain/check/import_ref.h" #include "toolchain/check/member_access.h" #include "toolchain/check/type_completion.h" diff --git a/toolchain/check/operator.cpp b/toolchain/check/operator.cpp index ee8fb4884e39..b2594e81af30 100644 --- a/toolchain/check/operator.cpp +++ b/toolchain/check/operator.cpp @@ -8,8 +8,8 @@ #include "toolchain/check/call.h" #include "toolchain/check/context.h" +#include "toolchain/check/cpp_import.h" #include "toolchain/check/generic.h" -#include "toolchain/check/import_cpp.h" #include "toolchain/check/member_access.h" #include "toolchain/check/name_lookup.h" #include "toolchain/sem_ir/class.h" diff --git a/toolchain/check/type_completion.cpp b/toolchain/check/type_completion.cpp index eb399dd0479c..361234eb4a74 100644 --- a/toolchain/check/type_completion.cpp +++ b/toolchain/check/type_completion.cpp @@ -6,8 +6,8 @@ #include "llvm/ADT/SmallVector.h" #include "toolchain/base/kind_switch.h" +#include "toolchain/check/cpp_import.h" #include "toolchain/check/generic.h" -#include "toolchain/check/import_cpp.h" #include "toolchain/check/inst.h" #include "toolchain/check/type.h" #include "toolchain/diagnostics/format_providers.h"