From 45ca3d28f5dfeeae08753226de9a1a28ca644a82 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Wed, 4 Feb 2026 09:24:55 -0800 Subject: [PATCH] Drop "diagnostic" from some filenames in the "diagnostics" folder (#6686) Mainly because "sorting_diagnostic_consumer" is legacy, since `SortingDiagnosticConsumer` became `SortingConsumer`. Also better reflecting contents of these files. Where I'm not renaming, I'm less positive about dropping "diagnostics" from "file_diagnostics" and "null_diagnostics" (which contain both a consumer and emitter, and "null.h" seems like poor naming), so not doing that here. Also "diagnostic.h" contains `struct Diagnostic`, so is a decent fit. Assisted-by: Google Antigravity with Gemini 3 Flash --- toolchain/base/BUILD | 2 +- toolchain/base/clang_invocation.h | 2 +- toolchain/check/BUILD | 10 ++-- toolchain/check/check.cpp | 2 +- toolchain/check/check.h | 2 +- toolchain/check/context.h | 2 +- toolchain/check/cpp/generate_ast.cpp | 2 +- toolchain/check/cpp/import.h | 2 +- toolchain/check/cpp/overload_resolution.cpp | 2 +- toolchain/check/diagnostic_emitter.h | 2 +- toolchain/check/eval.cpp | 2 +- toolchain/check/handle_let_and_var.cpp | 2 +- toolchain/check/handle_operator.cpp | 2 +- toolchain/check/impl.cpp | 2 +- toolchain/check/member_access.cpp | 2 +- toolchain/codegen/BUILD | 2 +- toolchain/codegen/codegen.cpp | 2 +- toolchain/codegen/codegen.h | 2 +- toolchain/diagnostics/BUILD | 48 +++++++++---------- toolchain/diagnostics/check_diagnostics.py | 2 +- .../{diagnostic_consumer.cpp => consumer.cpp} | 2 +- .../{diagnostic_consumer.h => consumer.h} | 6 +-- toolchain/diagnostics/coverage_test.cpp | 4 +- toolchain/diagnostics/diagnostic.h | 2 +- .../{diagnostic_emitter.h => emitter.h} | 10 ++-- ...stic_emitter_test.cpp => emitter_test.cpp} | 2 +- toolchain/diagnostics/file_diagnostics.h | 2 +- .../{diagnostic_kind.cpp => kind.cpp} | 4 +- .../{diagnostic_kind.def => kind.def} | 0 .../diagnostics/{diagnostic_kind.h => kind.h} | 16 +++---- toolchain/diagnostics/mocks.h | 2 +- toolchain/diagnostics/null_diagnostics.h | 2 +- ...agnostic_consumer.h => sorting_consumer.h} | 8 ++-- ...mer_test.cpp => sorting_consumer_test.cpp} | 4 +- toolchain/docs/diagnostics.md | 38 +++++++-------- toolchain/driver/BUILD | 6 +-- toolchain/driver/compile_subcommand.cpp | 4 +- toolchain/driver/config_subcommand.cpp | 4 +- toolchain/driver/driver_env.h | 2 +- toolchain/driver/format_subcommand.cpp | 2 +- .../driver/language_server_subcommand.cpp | 2 +- toolchain/language_server/BUILD | 4 +- toolchain/language_server/context.cpp | 4 +- toolchain/language_server/context.h | 4 +- toolchain/language_server/language_server.cpp | 2 +- toolchain/language_server/language_server.h | 2 +- toolchain/lex/BUILD | 26 +++++----- toolchain/lex/helpers.h | 2 +- toolchain/lex/lex.h | 2 +- toolchain/lex/numeric_literal.h | 2 +- toolchain/lex/numeric_literal_test.cpp | 2 +- toolchain/lex/string_literal.h | 2 +- toolchain/lex/string_literal_test.cpp | 2 +- toolchain/lex/test_helpers.h | 2 +- toolchain/lex/tokenized_buffer.cpp | 2 +- toolchain/lex/tokenized_buffer.h | 2 +- toolchain/lex/tokenized_buffer_benchmark.cpp | 2 +- toolchain/lex/tokenized_buffer_test.cpp | 2 +- toolchain/parse/BUILD | 10 ++-- toolchain/parse/context.cpp | 2 +- toolchain/parse/parse.h | 2 +- toolchain/parse/tree_test.cpp | 2 +- toolchain/sem_ir/BUILD | 4 +- toolchain/sem_ir/diagnostic_loc_converter.h | 2 +- toolchain/sem_ir/ids.h | 2 +- toolchain/source/BUILD | 4 +- toolchain/source/source_buffer.h | 2 +- toolchain/source/source_buffer_test.cpp | 2 +- toolchain/testing/BUILD | 2 +- toolchain/testing/compile_helper.h | 2 +- 70 files changed, 158 insertions(+), 158 deletions(-) rename toolchain/diagnostics/{diagnostic_consumer.cpp => consumer.cpp} (96%) rename toolchain/diagnostics/{diagnostic_consumer.h => consumer.h} (94%) rename toolchain/diagnostics/{diagnostic_emitter.h => emitter.h} (98%) rename toolchain/diagnostics/{diagnostic_emitter_test.cpp => emitter_test.cpp} (98%) rename toolchain/diagnostics/{diagnostic_kind.cpp => kind.cpp} (75%) rename toolchain/diagnostics/{diagnostic_kind.def => kind.def} (100%) rename toolchain/diagnostics/{diagnostic_kind.h => kind.h} (71%) rename toolchain/diagnostics/{sorting_diagnostic_consumer.h => sorting_consumer.h} (89%) rename toolchain/diagnostics/{sorting_diagnostic_consumer_test.cpp => sorting_consumer_test.cpp} (94%) diff --git a/toolchain/base/BUILD b/toolchain/base/BUILD index 883a2d622bc9..2d4b7096e87a 100644 --- a/toolchain/base/BUILD +++ b/toolchain/base/BUILD @@ -57,7 +57,7 @@ cc_library( ":install_paths", "//common:check", "//common:string_helpers", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@llvm-project//clang:basic", "@llvm-project//clang:driver", "@llvm-project//clang:frontend", diff --git a/toolchain/base/clang_invocation.h b/toolchain/base/clang_invocation.h index b54844b764d9..258dde9c8f74 100644 --- a/toolchain/base/clang_invocation.h +++ b/toolchain/base/clang_invocation.h @@ -13,7 +13,7 @@ #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/Support/VirtualFileSystem.h" #include "toolchain/base/install_paths.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon { diff --git a/toolchain/check/BUILD b/toolchain/check/BUILD index c3b74ba056c2..ee11619b9989 100644 --- a/toolchain/check/BUILD +++ b/toolchain/check/BUILD @@ -161,7 +161,7 @@ cc_library( "//toolchain/base:value_store", "//toolchain/check:generic_region_stack", "//toolchain/check:scope_stack", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:format_providers", "//toolchain/lex:token_info", "//toolchain/lex:token_kind", @@ -224,8 +224,8 @@ cc_library( deps = [ ":context", ":core_identifier", - ":diagnostic_emitter", ":dump", + ":emitter", ":scope_stack", "//common:check", "//common:error", @@ -239,7 +239,7 @@ cc_library( "//toolchain/base:kind_switch", "//toolchain/base:shared_value_stores", "//toolchain/base:timings", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:format_providers", "//toolchain/lex:token_index", "//toolchain/lex:token_kind", @@ -343,14 +343,14 @@ cc_library( ) cc_library( - name = "diagnostic_emitter", + name = "emitter", srcs = ["diagnostic_emitter.cpp"], hdrs = ["diagnostic_emitter.h"], deps = [ ":context", "//common:ostream", "//common:raw_string_ostream", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/lex:token_index", "//toolchain/parse:tree", "//toolchain/sem_ir:absolute_node_id", diff --git a/toolchain/check/check.cpp b/toolchain/check/check.cpp index e4611aa66747..b9f0023d2bd3 100644 --- a/toolchain/check/check.cpp +++ b/toolchain/check/check.cpp @@ -15,8 +15,8 @@ #include "toolchain/check/cpp/import.h" #include "toolchain/check/diagnostic_emitter.h" #include "toolchain/check/diagnostic_helpers.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/diagnostics/diagnostic.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" #include "toolchain/diagnostics/format_providers.h" #include "toolchain/lex/token_kind.h" #include "toolchain/parse/node_ids.h" diff --git a/toolchain/check/check.h b/toolchain/check/check.h index 92c03a7de66e..22696d9e1088 100644 --- a/toolchain/check/check.h +++ b/toolchain/check/check.h @@ -10,7 +10,7 @@ #include "toolchain/base/shared_value_stores.h" #include "toolchain/base/timings.h" #include "toolchain/check/diagnostic_emitter.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/parse/tree_and_subtrees.h" #include "toolchain/sem_ir/file.h" #include "toolchain/sem_ir/ids.h" diff --git a/toolchain/check/context.h b/toolchain/check/context.h index b4f42ac3af92..a7f82766d22a 100644 --- a/toolchain/check/context.h +++ b/toolchain/check/context.h @@ -26,7 +26,7 @@ #include "toolchain/check/param_and_arg_refs_stack.h" #include "toolchain/check/region_stack.h" #include "toolchain/check/scope_stack.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/parse/node_ids.h" #include "toolchain/parse/tree.h" #include "toolchain/parse/tree_and_subtrees.h" diff --git a/toolchain/check/cpp/generate_ast.cpp b/toolchain/check/cpp/generate_ast.cpp index 9a1204772f4b..00c03b62d22e 100644 --- a/toolchain/check/cpp/generate_ast.cpp +++ b/toolchain/check/cpp/generate_ast.cpp @@ -25,7 +25,7 @@ #include "llvm/Support/raw_ostream.h" #include "toolchain/check/context.h" #include "toolchain/diagnostics/diagnostic.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/format_providers.h" #include "toolchain/parse/node_ids.h" #include "toolchain/sem_ir/cpp_file.h" diff --git a/toolchain/check/cpp/import.h b/toolchain/check/cpp/import.h index 3827e201522f..df65d5bcf5fc 100644 --- a/toolchain/check/cpp/import.h +++ b/toolchain/check/cpp/import.h @@ -12,7 +12,7 @@ #include "toolchain/check/context.h" #include "toolchain/check/convert.h" #include "toolchain/check/diagnostic_helpers.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/sem_ir/clang_decl.h" #include "toolchain/sem_ir/ids.h" diff --git a/toolchain/check/cpp/overload_resolution.cpp b/toolchain/check/cpp/overload_resolution.cpp index 8cafd86b91d4..0c832dedf3fa 100644 --- a/toolchain/check/cpp/overload_resolution.cpp +++ b/toolchain/check/cpp/overload_resolution.cpp @@ -15,7 +15,7 @@ #include "toolchain/check/cpp/type_mapping.h" #include "toolchain/check/member_access.h" #include "toolchain/check/name_lookup.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/sem_ir/function.h" #include "toolchain/sem_ir/ids.h" #include "toolchain/sem_ir/name_scope.h" diff --git a/toolchain/check/diagnostic_emitter.h b/toolchain/check/diagnostic_emitter.h index 55cbea69deb0..84e55514f34c 100644 --- a/toolchain/check/diagnostic_emitter.h +++ b/toolchain/check/diagnostic_emitter.h @@ -7,7 +7,7 @@ #include "llvm/ADT/ArrayRef.h" #include "toolchain/check/diagnostic_helpers.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/token_index.h" #include "toolchain/sem_ir/diagnostic_loc_converter.h" diff --git a/toolchain/check/eval.cpp b/toolchain/check/eval.cpp index d8f95b345213..7b4f5b005b57 100644 --- a/toolchain/check/eval.cpp +++ b/toolchain/check/eval.cpp @@ -23,7 +23,7 @@ #include "toolchain/check/type.h" #include "toolchain/check/type_completion.h" #include "toolchain/diagnostics/diagnostic.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/format_providers.h" #include "toolchain/sem_ir/builtin_function_kind.h" #include "toolchain/sem_ir/constant.h" diff --git a/toolchain/check/handle_let_and_var.cpp b/toolchain/check/handle_let_and_var.cpp index f5b72a736865..4ae54b3608e1 100644 --- a/toolchain/check/handle_let_and_var.cpp +++ b/toolchain/check/handle_let_and_var.cpp @@ -15,7 +15,7 @@ #include "toolchain/check/modifiers.h" #include "toolchain/check/pattern.h" #include "toolchain/check/pattern_match.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/format_providers.h" #include "toolchain/lex/token_kind.h" #include "toolchain/parse/node_ids.h" diff --git a/toolchain/check/handle_operator.cpp b/toolchain/check/handle_operator.cpp index d3116e93901e..22ba1a1bcbaa 100644 --- a/toolchain/check/handle_operator.cpp +++ b/toolchain/check/handle_operator.cpp @@ -11,7 +11,7 @@ #include "toolchain/check/operator.h" #include "toolchain/check/pointer_dereference.h" #include "toolchain/check/type.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/parse/typed_nodes.h" #include "toolchain/sem_ir/expr_info.h" diff --git a/toolchain/check/impl.cpp b/toolchain/check/impl.cpp index 9304088f8e3d..040fb9644652 100644 --- a/toolchain/check/impl.cpp +++ b/toolchain/check/impl.cpp @@ -24,7 +24,7 @@ #include "toolchain/check/type.h" #include "toolchain/check/type_completion.h" #include "toolchain/check/type_structure.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/sem_ir/generic.h" #include "toolchain/sem_ir/ids.h" #include "toolchain/sem_ir/impl.h" diff --git a/toolchain/check/member_access.cpp b/toolchain/check/member_access.cpp index f45f6530bf98..056927931216 100644 --- a/toolchain/check/member_access.cpp +++ b/toolchain/check/member_access.cpp @@ -20,7 +20,7 @@ #include "toolchain/check/name_lookup.h" #include "toolchain/check/type.h" #include "toolchain/check/type_completion.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/sem_ir/expr_info.h" #include "toolchain/sem_ir/function.h" #include "toolchain/sem_ir/generic.h" diff --git a/toolchain/codegen/BUILD b/toolchain/codegen/BUILD index b0fc98782408..15a798216843 100644 --- a/toolchain/codegen/BUILD +++ b/toolchain/codegen/BUILD @@ -17,7 +17,7 @@ cc_library( hdrs = ["codegen.h"], deps = [ "//common:check", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:file_diagnostics", "@llvm-project//llvm:Core", "@llvm-project//llvm:MC", diff --git a/toolchain/codegen/codegen.cpp b/toolchain/codegen/codegen.cpp index 945804bb8941..2372007dfe87 100644 --- a/toolchain/codegen/codegen.cpp +++ b/toolchain/codegen/codegen.cpp @@ -13,7 +13,7 @@ #include "llvm/MC/TargetRegistry.h" #include "llvm/Target/TargetOptions.h" #include "llvm/TargetParser/Host.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" namespace Carbon { diff --git a/toolchain/codegen/codegen.h b/toolchain/codegen/codegen.h index b145145f500f..69558eb82a6a 100644 --- a/toolchain/codegen/codegen.h +++ b/toolchain/codegen/codegen.h @@ -7,7 +7,7 @@ #include "llvm/IR/Module.h" #include "llvm/Target/TargetMachine.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/diagnostics/file_diagnostics.h" namespace Carbon { diff --git a/toolchain/diagnostics/BUILD b/toolchain/diagnostics/BUILD index bb57e5672437..6492d8e3dd91 100644 --- a/toolchain/diagnostics/BUILD +++ b/toolchain/diagnostics/BUILD @@ -8,19 +8,19 @@ load("//bazel/manifest:defs.bzl", "manifest") package(default_visibility = ["//visibility:public"]) cc_library( - name = "diagnostic_emitter", + name = "emitter", srcs = [ + "consumer.cpp", "diagnostic.cpp", - "diagnostic_consumer.cpp", ], hdrs = [ + "consumer.h", "diagnostic.h", - "diagnostic_consumer.h", - "diagnostic_emitter.h", + "emitter.h", ], deps = [ - ":diagnostic_kind", ":format_providers", + ":kind", "//common:check", "//common:ostream", "@llvm-project//llvm:Support", @@ -28,11 +28,11 @@ cc_library( ) cc_test( - name = "diagnostic_emitter_test", + name = "emitter_test", size = "small", - srcs = ["diagnostic_emitter_test.cpp"], + srcs = ["emitter_test.cpp"], deps = [ - ":diagnostic_emitter", + ":emitter", ":mocks", "//testing/base:gtest_main", "@googletest//:gtest", @@ -41,11 +41,11 @@ cc_test( ) cc_library( - name = "diagnostic_kind", - srcs = ["diagnostic_kind.cpp"], - hdrs = ["diagnostic_kind.h"], + name = "kind", + srcs = ["kind.cpp"], + hdrs = ["kind.h"], textual_hdrs = [ - "diagnostic_kind.def", + "kind.def", ], deps = [ "//common:enum_base", @@ -67,7 +67,7 @@ cc_test( "//toolchain/testing:all_testdata", ], deps = [ - ":diagnostic_kind", + ":kind", "//testing/base:gtest_main", "//toolchain/testing:coverage_helper", "@abseil-cpp//absl/flags:flag", @@ -79,7 +79,7 @@ cc_library( name = "file_diagnostics", hdrs = ["file_diagnostics.h"], deps = [ - ":diagnostic_emitter", + ":emitter", "@llvm-project//llvm:Support", ], ) @@ -100,7 +100,7 @@ cc_test( size = "small", srcs = ["format_providers_test.cpp"], deps = [ - ":diagnostic_emitter", + ":emitter", ":format_providers", ":mocks", "//testing/base:gtest_main", @@ -114,29 +114,29 @@ cc_library( testonly = 1, hdrs = ["null_diagnostics.h"], deps = [ - ":diagnostic_emitter", + ":emitter", "@llvm-project//llvm:Support", ], ) cc_library( - name = "sorting_diagnostic_consumer", - hdrs = ["sorting_diagnostic_consumer.h"], + name = "sorting_consumer", + hdrs = ["sorting_consumer.h"], deps = [ - ":diagnostic_emitter", + ":emitter", "//common:check", "@llvm-project//llvm:Support", ], ) cc_test( - name = "sorting_diagnostic_consumer_test", + name = "sorting_consumer_test", size = "small", - srcs = ["sorting_diagnostic_consumer_test.cpp"], + srcs = ["sorting_consumer_test.cpp"], deps = [ - ":diagnostic_emitter", + ":emitter", ":mocks", - ":sorting_diagnostic_consumer", + ":sorting_consumer", "//testing/base:gtest_main", "@googletest//:gtest", "@llvm-project//llvm:Support", @@ -149,7 +149,7 @@ cc_library( srcs = ["mocks.cpp"], hdrs = ["mocks.h"], deps = [ - ":diagnostic_emitter", + ":emitter", "@googletest//:gtest", "@llvm-project//llvm:Support", ], diff --git a/toolchain/diagnostics/check_diagnostics.py b/toolchain/diagnostics/check_diagnostics.py index c995e6c7b9f5..0a846c5acf83 100755 --- a/toolchain/diagnostics/check_diagnostics.py +++ b/toolchain/diagnostics/check_diagnostics.py @@ -41,7 +41,7 @@ def load_diagnostic_kind() -> Set[str]: This isn't validated for uniqueness because the compiler does that. """ - path = Path("toolchain/diagnostics/diagnostic_kind.def") + path = Path("toolchain/diagnostics/kind.def") content = path.read_text() decls = set(re.findall(r"^\s+CARBON_DIAGNOSTIC_KIND\((.+)\)", content)) return decls.difference(IGNORED) diff --git a/toolchain/diagnostics/diagnostic_consumer.cpp b/toolchain/diagnostics/consumer.cpp similarity index 96% rename from toolchain/diagnostics/diagnostic_consumer.cpp rename to toolchain/diagnostics/consumer.cpp index ae77ef68ab02..a794be6c28d5 100644 --- a/toolchain/diagnostics/diagnostic_consumer.cpp +++ b/toolchain/diagnostics/consumer.cpp @@ -2,7 +2,7 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" #include #include diff --git a/toolchain/diagnostics/diagnostic_consumer.h b/toolchain/diagnostics/consumer.h similarity index 94% rename from toolchain/diagnostics/diagnostic_consumer.h rename to toolchain/diagnostics/consumer.h index 143db8fc8177..5c0e83023be5 100644 --- a/toolchain/diagnostics/diagnostic_consumer.h +++ b/toolchain/diagnostics/consumer.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_CONSUMER_H_ -#define CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_CONSUMER_H_ +#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_CONSUMER_H_ +#define CARBON_TOOLCHAIN_DIAGNOSTICS_CONSUMER_H_ #include "common/ostream.h" #include "llvm/ADT/StringRef.h" @@ -89,4 +89,4 @@ class ErrorTrackingConsumer : public Consumer { } // namespace Carbon::Diagnostics -#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_CONSUMER_H_ +#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_CONSUMER_H_ diff --git a/toolchain/diagnostics/coverage_test.cpp b/toolchain/diagnostics/coverage_test.cpp index be816998e57b..f3e1641e9f27 100644 --- a/toolchain/diagnostics/coverage_test.cpp +++ b/toolchain/diagnostics/coverage_test.cpp @@ -5,7 +5,7 @@ #include #include "absl/flags/flag.h" -#include "toolchain/diagnostics/diagnostic_kind.h" +#include "toolchain/diagnostics/kind.h" #include "toolchain/testing/coverage_helper.h" ABSL_FLAG(std::string, testdata_manifest, "", @@ -16,7 +16,7 @@ namespace { constexpr Kind Kinds[] = { #define CARBON_DIAGNOSTIC_KIND(Name) Kind::Name, -#include "toolchain/diagnostics/diagnostic_kind.def" +#include "toolchain/diagnostics/kind.def" }; constexpr Kind UntestedKinds[] = { diff --git a/toolchain/diagnostics/diagnostic.h b/toolchain/diagnostics/diagnostic.h index 9085424fb6c3..171452662d01 100644 --- a/toolchain/diagnostics/diagnostic.h +++ b/toolchain/diagnostics/diagnostic.h @@ -13,7 +13,7 @@ #include "llvm/ADT/Any.h" #include "llvm/ADT/SmallVector.h" #include "llvm/ADT/StringRef.h" -#include "toolchain/diagnostics/diagnostic_kind.h" +#include "toolchain/diagnostics/kind.h" namespace Carbon::Diagnostics { diff --git a/toolchain/diagnostics/diagnostic_emitter.h b/toolchain/diagnostics/emitter.h similarity index 98% rename from toolchain/diagnostics/diagnostic_emitter.h rename to toolchain/diagnostics/emitter.h index 9bab3ba2fda3..832c48c644ec 100644 --- a/toolchain/diagnostics/diagnostic_emitter.h +++ b/toolchain/diagnostics/emitter.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_EMITTER_H_ -#define CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_EMITTER_H_ +#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_EMITTER_H_ +#define CARBON_TOOLCHAIN_DIAGNOSTICS_EMITTER_H_ #include #include @@ -14,9 +14,9 @@ #include "llvm/ADT/Any.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/FormatVariadic.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/diagnostics/diagnostic.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" -#include "toolchain/diagnostics/diagnostic_kind.h" +#include "toolchain/diagnostics/kind.h" namespace Carbon::Diagnostics { @@ -457,4 +457,4 @@ auto Emitter::MakeAny(Arg arg) -> llvm::Any { } // namespace Carbon::Diagnostics -#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_EMITTER_H_ +#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_EMITTER_H_ diff --git a/toolchain/diagnostics/diagnostic_emitter_test.cpp b/toolchain/diagnostics/emitter_test.cpp similarity index 98% rename from toolchain/diagnostics/diagnostic_emitter_test.cpp rename to toolchain/diagnostics/emitter_test.cpp index f596947e3c23..a8553577a0c6 100644 --- a/toolchain/diagnostics/diagnostic_emitter_test.cpp +++ b/toolchain/diagnostics/emitter_test.cpp @@ -2,7 +2,7 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include #include diff --git a/toolchain/diagnostics/file_diagnostics.h b/toolchain/diagnostics/file_diagnostics.h index 2d0d57a25406..afb1a31e2209 100644 --- a/toolchain/diagnostics/file_diagnostics.h +++ b/toolchain/diagnostics/file_diagnostics.h @@ -5,7 +5,7 @@ #ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_FILE_DIAGNOSTICS_H_ #define CARBON_TOOLCHAIN_DIAGNOSTICS_FILE_DIAGNOSTICS_H_ -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Diagnostics { diff --git a/toolchain/diagnostics/diagnostic_kind.cpp b/toolchain/diagnostics/kind.cpp similarity index 75% rename from toolchain/diagnostics/diagnostic_kind.cpp rename to toolchain/diagnostics/kind.cpp index 790b52b3e483..c0e29b454940 100644 --- a/toolchain/diagnostics/diagnostic_kind.cpp +++ b/toolchain/diagnostics/kind.cpp @@ -2,13 +2,13 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/diagnostics/diagnostic_kind.h" // IWYU pragma: keep +#include "toolchain/diagnostics/kind.h" // IWYU pragma: keep namespace Carbon::Diagnostics { CARBON_DEFINE_ENUM_CLASS_NAMES(Kind) { #define CARBON_DIAGNOSTIC_KIND(Name) CARBON_ENUM_CLASS_NAME_STRING(Name) -#include "toolchain/diagnostics/diagnostic_kind.def" +#include "toolchain/diagnostics/kind.def" }; } // namespace Carbon::Diagnostics diff --git a/toolchain/diagnostics/diagnostic_kind.def b/toolchain/diagnostics/kind.def similarity index 100% rename from toolchain/diagnostics/diagnostic_kind.def rename to toolchain/diagnostics/kind.def diff --git a/toolchain/diagnostics/diagnostic_kind.h b/toolchain/diagnostics/kind.h similarity index 71% rename from toolchain/diagnostics/diagnostic_kind.h rename to toolchain/diagnostics/kind.h index 6f446e09140e..69dc0d6b0475 100644 --- a/toolchain/diagnostics/diagnostic_kind.h +++ b/toolchain/diagnostics/kind.h @@ -2,8 +2,8 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_KIND_H_ -#define CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_KIND_H_ +#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_KIND_H_ +#define CARBON_TOOLCHAIN_DIAGNOSTICS_KIND_H_ #include @@ -15,12 +15,12 @@ namespace Carbon::Diagnostics { // long-term. CARBON_DEFINE_RAW_ENUM_CLASS(Kind, uint16_t) { #define CARBON_DIAGNOSTIC_KIND(Name) CARBON_RAW_ENUM_ENUMERATOR(Name) -#include "toolchain/diagnostics/diagnostic_kind.def" +#include "toolchain/diagnostics/kind.def" }; // An enumeration of all diagnostics provided by the toolchain. Diagnostics must -// be added to diagnostic_kind.def, and defined locally to where they're -// used using the `DIAGNOSTIC` macro in diagnostic_emitter.h. +// be added to kind.def, and defined locally to where they're used using the +// `DIAGNOSTIC` macro in emitter.h. // // Diagnostic definitions are decentralized because placing all diagnostic // definitions centrally is expected to create a compilation bottleneck @@ -29,15 +29,15 @@ CARBON_DEFINE_RAW_ENUM_CLASS(Kind, uint16_t) { class Kind : public CARBON_ENUM_BASE(Kind) { public: #define CARBON_DIAGNOSTIC_KIND(Name) CARBON_ENUM_CONSTANT_DECL(Name) -#include "toolchain/diagnostics/diagnostic_kind.def" +#include "toolchain/diagnostics/kind.def" }; #define CARBON_DIAGNOSTIC_KIND(Name) CARBON_ENUM_CONSTANT_DEFINITION(Kind, Name) -#include "toolchain/diagnostics/diagnostic_kind.def" +#include "toolchain/diagnostics/kind.def" // We expect Kind to fit into 2 bits. static_assert(sizeof(Kind) == 2, "Kind includes padding!"); } // namespace Carbon::Diagnostics -#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_DIAGNOSTIC_KIND_H_ +#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_KIND_H_ diff --git a/toolchain/diagnostics/mocks.h b/toolchain/diagnostics/mocks.h index 375858afc220..9d87e36ce7ee 100644 --- a/toolchain/diagnostics/mocks.h +++ b/toolchain/diagnostics/mocks.h @@ -7,7 +7,7 @@ #include -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Testing { diff --git a/toolchain/diagnostics/null_diagnostics.h b/toolchain/diagnostics/null_diagnostics.h index 24dc399cc06a..7aa2bb4d642c 100644 --- a/toolchain/diagnostics/null_diagnostics.h +++ b/toolchain/diagnostics/null_diagnostics.h @@ -5,7 +5,7 @@ #ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_NULL_DIAGNOSTICS_H_ #define CARBON_TOOLCHAIN_DIAGNOSTICS_NULL_DIAGNOSTICS_H_ -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Diagnostics { diff --git a/toolchain/diagnostics/sorting_diagnostic_consumer.h b/toolchain/diagnostics/sorting_consumer.h similarity index 89% rename from toolchain/diagnostics/sorting_diagnostic_consumer.h rename to toolchain/diagnostics/sorting_consumer.h index 2299f81457eb..4d08db3cfd8e 100644 --- a/toolchain/diagnostics/sorting_diagnostic_consumer.h +++ b/toolchain/diagnostics/sorting_consumer.h @@ -2,12 +2,12 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_SORTING_DIAGNOSTIC_CONSUMER_H_ -#define CARBON_TOOLCHAIN_DIAGNOSTICS_SORTING_DIAGNOSTIC_CONSUMER_H_ +#ifndef CARBON_TOOLCHAIN_DIAGNOSTICS_SORTING_CONSUMER_H_ +#define CARBON_TOOLCHAIN_DIAGNOSTICS_SORTING_CONSUMER_H_ #include "common/check.h" #include "llvm/ADT/STLExtras.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Diagnostics { @@ -60,4 +60,4 @@ class SortingConsumer : public Consumer { } // namespace Carbon::Diagnostics -#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_SORTING_DIAGNOSTIC_CONSUMER_H_ +#endif // CARBON_TOOLCHAIN_DIAGNOSTICS_SORTING_CONSUMER_H_ diff --git a/toolchain/diagnostics/sorting_diagnostic_consumer_test.cpp b/toolchain/diagnostics/sorting_consumer_test.cpp similarity index 94% rename from toolchain/diagnostics/sorting_diagnostic_consumer_test.cpp rename to toolchain/diagnostics/sorting_consumer_test.cpp index 978fa37d7dc8..7c89dfa732e4 100644 --- a/toolchain/diagnostics/sorting_diagnostic_consumer_test.cpp +++ b/toolchain/diagnostics/sorting_consumer_test.cpp @@ -2,13 +2,13 @@ // Exceptions. See /LICENSE for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -#include "toolchain/diagnostics/sorting_diagnostic_consumer.h" +#include "toolchain/diagnostics/sorting_consumer.h" #include #include #include "llvm/ADT/StringRef.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/mocks.h" namespace Carbon::Diagnostics { diff --git a/toolchain/docs/diagnostics.md b/toolchain/docs/diagnostics.md index 1a60bbc9cb8a..bad20dd82562 100644 --- a/toolchain/docs/diagnostics.md +++ b/toolchain/docs/diagnostics.md @@ -28,8 +28,8 @@ The diagnostic code is used by the toolchain to produce output. ## DiagnosticEmitter -[DiagnosticEmitters](/toolchain/diagnostics/diagnostic_emitter.h) handle the -main formatting of a message. It's parameterized on a location type, for which a +[Emitters](/toolchain/diagnostics/emitter.h) handle the main formatting of a +message. It's parameterized on a location type, for which a DiagnosticLocationTranslator must be provided that can translate the location type into a standardized DiagnosticLocation of file, line, and column. @@ -41,25 +41,25 @@ DiagnosticConsumer. DiagnosticConsumers handle output of diagnostic messages after they've been formatted by an Emitter. Important consumers are: -- [ConsoleDiagnosticConsumer](/toolchain/diagnostics/diagnostic_consumer.cpp): - prints diagnostics to console. +- [ConsoleConsumer](/toolchain/diagnostics/consumer.cpp): prints diagnostics + to console. -- [ErrorTrackingDiagnosticConsumer](/toolchain/diagnostics/diagnostic_consumer.h): - counts the number of errors produced, particularly so that it can be - determined whether any errors were encountered. +- [ErrorTrackingConsumer](/toolchain/diagnostics/consumer.h): counts the + number of errors produced, particularly so that it can be determined whether + any errors were encountered. -- [SortingDiagnosticConsumer](/toolchain/diagnostics/sorting_diagnostic_consumer.h): - sorts diagnostics by line so that diagnostics are seen in terminal based on - their order in the file rather than the order they were produced. +- [SortingConsumer](/toolchain/diagnostics/sorting_consumer.h): sorts + diagnostics by line so that diagnostics are seen in terminal based on their + order in the file rather than the order they were produced. -- [NullDiagnosticConsumer](/toolchain/diagnostics/null_diagnostics.h): - suppresses diagnostics, particularly for tests. +- [NullConsumer](/toolchain/diagnostics/null_diagnostics.h): suppresses + diagnostics, particularly for tests. -Note that `SortingDiagnosticConsumer` is used by default by `carbon compile`. In -cases where one error leads to another error at an earlier location, for example -if an error in a function call argument leads to an error in the function call, -this can result in confusing diagnostic output where a consequence of the error -is reported before the cause. Usually this should be handled by tracking that an +Note that `SortingConsumer` is used by default by `carbon compile`. In cases +where one error leads to another error at an earlier location, for example if an +error in a function call argument leads to an error in the function call, this +can result in confusing diagnostic output where a consequence of the error is +reported before the cause. Usually this should be handled by tracking that an error occurred and suppressing the follow-on diagnostic. During toolchain development, it can be useful to disable the sorting so that the diagnostic order matches the order in which the file was processed. This can be done using @@ -96,8 +96,8 @@ message format to `llvm::formatv` to produce the final diagnostic message. ## Diagnostic registry -There is a [registry](/toolchain/diagnostics/diagnostic_kind.def) which all -diagnostics must be added to. Each diagnostic has a line like: +There is a [registry](/toolchain/diagnostics/kind.def) which all diagnostics +must be added to. Each diagnostic has a line like: ```cpp CARBON_DIAGNOSTIC_KIND(InvalidCode) diff --git a/toolchain/driver/BUILD b/toolchain/driver/BUILD index 16ca1352b1d4..a14f4bfe5e6f 100644 --- a/toolchain/driver/BUILD +++ b/toolchain/driver/BUILD @@ -214,8 +214,8 @@ cc_library( "//toolchain/base:timings", "//toolchain/check", "//toolchain/codegen", - "//toolchain/diagnostics:diagnostic_emitter", - "//toolchain/diagnostics:sorting_diagnostic_consumer", + "//toolchain/diagnostics:emitter", + "//toolchain/diagnostics:sorting_consumer", "//toolchain/format", "//toolchain/language_server", "//toolchain/lex", @@ -251,7 +251,7 @@ cc_test( "//testing/base:global_exe_path", "//testing/base:gtest_main", "//toolchain/base:install_paths", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/lex:tokenized_buffer_test_helpers", "//toolchain/testing:yaml_test_helpers", "@googletest//:gtest", diff --git a/toolchain/driver/compile_subcommand.cpp b/toolchain/driver/compile_subcommand.cpp index bd49e3481cf7..26fe55a229cb 100644 --- a/toolchain/driver/compile_subcommand.cpp +++ b/toolchain/driver/compile_subcommand.cpp @@ -23,8 +23,8 @@ #include "toolchain/base/timings.h" #include "toolchain/check/check.h" #include "toolchain/codegen/codegen.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" -#include "toolchain/diagnostics/sorting_diagnostic_consumer.h" +#include "toolchain/diagnostics/emitter.h" +#include "toolchain/diagnostics/sorting_consumer.h" #include "toolchain/lex/lex.h" #include "toolchain/lower/lower.h" #include "toolchain/parse/parse.h" diff --git a/toolchain/driver/config_subcommand.cpp b/toolchain/driver/config_subcommand.cpp index abcd070d6184..21465543b314 100644 --- a/toolchain/driver/config_subcommand.cpp +++ b/toolchain/driver/config_subcommand.cpp @@ -24,9 +24,9 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/TargetParser/Triple.h" #include "toolchain/base/clang_invocation.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/diagnostics/diagnostic.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/driver/clang_runner.h" #include "toolchain/driver/driver_env.h" #include "toolchain/driver/driver_subcommand.h" diff --git a/toolchain/driver/driver_env.h b/toolchain/driver/driver_env.h index 0fceecfaf8c9..c9cebb8ca34b 100644 --- a/toolchain/driver/driver_env.h +++ b/toolchain/driver/driver_env.h @@ -13,7 +13,7 @@ #include "llvm/Support/Threading.h" #include "llvm/Support/VirtualFileSystem.h" #include "toolchain/base/install_paths.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/driver/runtimes_cache.h" namespace Carbon { diff --git a/toolchain/driver/format_subcommand.cpp b/toolchain/driver/format_subcommand.cpp index 4d96b239cfbc..3f7fc1a13117 100644 --- a/toolchain/driver/format_subcommand.cpp +++ b/toolchain/driver/format_subcommand.cpp @@ -8,7 +8,7 @@ #include "common/raw_string_ostream.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/format/format.h" #include "toolchain/lex/lex.h" #include "toolchain/source/source_buffer.h" diff --git a/toolchain/driver/language_server_subcommand.cpp b/toolchain/driver/language_server_subcommand.cpp index 478c4855a997..b55e686a5c15 100644 --- a/toolchain/driver/language_server_subcommand.cpp +++ b/toolchain/driver/language_server_subcommand.cpp @@ -4,7 +4,7 @@ #include "toolchain/driver/language_server_subcommand.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/language_server/language_server.h" namespace Carbon { diff --git a/toolchain/language_server/BUILD b/toolchain/language_server/BUILD index 6464bc10b15c..74f21e92d092 100644 --- a/toolchain/language_server/BUILD +++ b/toolchain/language_server/BUILD @@ -22,7 +22,7 @@ cc_library( "//common:ostream", "//common:raw_string_ostream", "//toolchain/base:install_paths", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@llvm-project//clang-tools-extra/clangd:ClangDaemon", ], ) @@ -39,7 +39,7 @@ cc_library( "//toolchain/base:install_paths", "//toolchain/base:shared_value_stores", "//toolchain/check", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:file_diagnostics", "//toolchain/lex", "//toolchain/lex:tokenized_buffer", diff --git a/toolchain/language_server/context.cpp b/toolchain/language_server/context.cpp index 50c9ba0669f5..e5ca11723396 100644 --- a/toolchain/language_server/context.cpp +++ b/toolchain/language_server/context.cpp @@ -14,9 +14,9 @@ #include "toolchain/base/clang_invocation.h" #include "toolchain/base/shared_value_stores.h" #include "toolchain/check/check.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/diagnostics/diagnostic.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/lex.h" #include "toolchain/lex/tokenized_buffer.h" #include "toolchain/parse/parse.h" diff --git a/toolchain/language_server/context.h b/toolchain/language_server/context.h index ec18e7fe1055..1671599a7bf3 100644 --- a/toolchain/language_server/context.h +++ b/toolchain/language_server/context.h @@ -12,8 +12,8 @@ #include "common/map.h" #include "toolchain/base/install_paths.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/consumer.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/file_diagnostics.h" #include "toolchain/lex/tokenized_buffer.h" #include "toolchain/parse/tree_and_subtrees.h" diff --git a/toolchain/language_server/language_server.cpp b/toolchain/language_server/language_server.cpp index 74ae2a26bccb..ab05c9e94a7f 100644 --- a/toolchain/language_server/language_server.cpp +++ b/toolchain/language_server/language_server.cpp @@ -10,7 +10,7 @@ #include "clang-tools-extra/clangd/Transport.h" #include "clang-tools-extra/clangd/support/Logger.h" #include "common/raw_string_ostream.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/language_server/context.h" #include "toolchain/language_server/incoming_messages.h" #include "toolchain/language_server/outgoing_messages.h" diff --git a/toolchain/language_server/language_server.h b/toolchain/language_server/language_server.h index cda3eb419077..3a4fb548d063 100644 --- a/toolchain/language_server/language_server.h +++ b/toolchain/language_server/language_server.h @@ -7,7 +7,7 @@ #include "common/ostream.h" #include "toolchain/base/install_paths.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" namespace Carbon::LanguageServer { diff --git a/toolchain/lex/BUILD b/toolchain/lex/BUILD index d60b23548b56..a8f8e57ce6b4 100644 --- a/toolchain/lex/BUILD +++ b/toolchain/lex/BUILD @@ -47,7 +47,7 @@ cc_library( srcs = ["helpers.cpp"], hdrs = ["helpers.h"], deps = [ - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@llvm-project//llvm:Support", ], ) @@ -59,7 +59,7 @@ cc_library( deps = [ "//common:check", "//common:string_helpers", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@googletest//:gtest", "@llvm-project//llvm:Support", ], @@ -73,7 +73,7 @@ cc_library( ":character_set", ":helpers", "//common:check", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:format_providers", "@llvm-project//llvm:Support", ], @@ -102,7 +102,7 @@ cc_test( "//common:check", "//common:ostream", "//testing/base:gtest_main", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@googletest//:gtest", "@llvm-project//llvm:Support", ], @@ -116,7 +116,7 @@ cc_fuzz_test( deps = [ ":numeric_literal", "//testing/fuzzing:libfuzzer_header", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:null_diagnostics", "@llvm-project//llvm:Support", ], @@ -131,7 +131,7 @@ cc_library( ":helpers", ":token_info", "//common:check", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@llvm-project//llvm:Support", ], ) @@ -158,7 +158,7 @@ cc_test( "//common:check", "//common:ostream", "//testing/base:gtest_main", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@googletest//:gtest", "@llvm-project//llvm:Support", ], @@ -173,7 +173,7 @@ cc_fuzz_test( ":string_literal", "//common:check", "//testing/fuzzing:libfuzzer_header", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:null_diagnostics", "@llvm-project//llvm:Support", ], @@ -197,7 +197,7 @@ cc_library( "//common:vlog", "//toolchain/base:kind_switch", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:format_providers", "//toolchain/source:source_buffer", "@llvm-project//llvm:Support", @@ -256,7 +256,7 @@ cc_library( "//toolchain/base:index_base", "//toolchain/base:mem_usage", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/source:source_buffer", "@llvm-project//llvm:Support", ], @@ -288,7 +288,7 @@ cc_test( "//common:raw_string_ostream", "//testing/base:gtest_main", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:mocks", "//toolchain/testing:compile_helper", "//toolchain/testing:yaml_test_helpers", @@ -307,7 +307,7 @@ cc_fuzz_test( "//common:check", "//testing/fuzzing:libfuzzer_header", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:null_diagnostics", "@llvm-project//llvm:Support", ], @@ -326,7 +326,7 @@ cc_binary( "//testing/base:benchmark_main", "//testing/base:source_gen_lib", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:null_diagnostics", "@abseil-cpp//absl/random", "@google_benchmark//:benchmark", diff --git a/toolchain/lex/helpers.h b/toolchain/lex/helpers.h index 5217a1b71e41..3811cb7a871a 100644 --- a/toolchain/lex/helpers.h +++ b/toolchain/lex/helpers.h @@ -5,7 +5,7 @@ #ifndef CARBON_TOOLCHAIN_LEX_HELPERS_H_ #define CARBON_TOOLCHAIN_LEX_HELPERS_H_ -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Lex { diff --git a/toolchain/lex/lex.h b/toolchain/lex/lex.h index ec45029106e6..fdfefe567ed7 100644 --- a/toolchain/lex/lex.h +++ b/toolchain/lex/lex.h @@ -6,7 +6,7 @@ #define CARBON_TOOLCHAIN_LEX_LEX_H_ #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/tokenized_buffer.h" #include "toolchain/source/source_buffer.h" diff --git a/toolchain/lex/numeric_literal.h b/toolchain/lex/numeric_literal.h index 03896dbf50b4..90af4316bec9 100644 --- a/toolchain/lex/numeric_literal.h +++ b/toolchain/lex/numeric_literal.h @@ -10,7 +10,7 @@ #include "llvm/ADT/APInt.h" #include "llvm/ADT/StringRef.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Lex { diff --git a/toolchain/lex/numeric_literal_test.cpp b/toolchain/lex/numeric_literal_test.cpp index 054f088e5d26..94f0fd8d5536 100644 --- a/toolchain/lex/numeric_literal_test.cpp +++ b/toolchain/lex/numeric_literal_test.cpp @@ -11,7 +11,7 @@ #include #include "common/check.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/test_helpers.h" namespace Carbon::Lex { diff --git a/toolchain/lex/string_literal.h b/toolchain/lex/string_literal.h index 701af03da5fa..30a5905c0848 100644 --- a/toolchain/lex/string_literal.h +++ b/toolchain/lex/string_literal.h @@ -9,7 +9,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/Allocator.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/token_info.h" namespace Carbon::Lex { diff --git a/toolchain/lex/string_literal_test.cpp b/toolchain/lex/string_literal_test.cpp index 013806ccb39b..c5641756b7e6 100644 --- a/toolchain/lex/string_literal_test.cpp +++ b/toolchain/lex/string_literal_test.cpp @@ -12,7 +12,7 @@ #include #include "common/check.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/test_helpers.h" namespace Carbon::Lex { diff --git a/toolchain/lex/test_helpers.h b/toolchain/lex/test_helpers.h index 91bb51bbd937..03b177e5d574 100644 --- a/toolchain/lex/test_helpers.h +++ b/toolchain/lex/test_helpers.h @@ -11,7 +11,7 @@ #include "common/check.h" #include "common/string_helpers.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon::Testing { diff --git a/toolchain/lex/tokenized_buffer.cpp b/toolchain/lex/tokenized_buffer.cpp index b1beb62135d6..a3479d4b66e0 100644 --- a/toolchain/lex/tokenized_buffer.cpp +++ b/toolchain/lex/tokenized_buffer.cpp @@ -16,7 +16,7 @@ #include "llvm/Support/Format.h" #include "llvm/Support/FormatVariadic.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/character_set.h" #include "toolchain/lex/numeric_literal.h" #include "toolchain/lex/string_literal.h" diff --git a/toolchain/lex/tokenized_buffer.h b/toolchain/lex/tokenized_buffer.h index 5484c9a1b2f2..8de771385253 100644 --- a/toolchain/lex/tokenized_buffer.h +++ b/toolchain/lex/tokenized_buffer.h @@ -17,7 +17,7 @@ #include "toolchain/base/index_base.h" #include "toolchain/base/mem_usage.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/token_index.h" #include "toolchain/lex/token_info.h" #include "toolchain/lex/token_kind.h" diff --git a/toolchain/lex/tokenized_buffer_benchmark.cpp b/toolchain/lex/tokenized_buffer_benchmark.cpp index c35f80198041..aa9137a9ad75 100644 --- a/toolchain/lex/tokenized_buffer_benchmark.cpp +++ b/toolchain/lex/tokenized_buffer_benchmark.cpp @@ -16,7 +16,7 @@ #include "llvm/ADT/StringExtras.h" #include "testing/base/source_gen.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/null_diagnostics.h" #include "toolchain/lex/lex.h" #include "toolchain/lex/token_kind.h" diff --git a/toolchain/lex/tokenized_buffer_test.cpp b/toolchain/lex/tokenized_buffer_test.cpp index c31cb416df90..105c5fb581e6 100644 --- a/toolchain/lex/tokenized_buffer_test.cpp +++ b/toolchain/lex/tokenized_buffer_test.cpp @@ -17,7 +17,7 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/Support/FormatVariadic.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/mocks.h" #include "toolchain/lex/lex.h" #include "toolchain/lex/tokenized_buffer_test_helpers.h" diff --git a/toolchain/parse/BUILD b/toolchain/parse/BUILD index 846d1bf8038e..81508f9e4a57 100644 --- a/toolchain/parse/BUILD +++ b/toolchain/parse/BUILD @@ -59,7 +59,7 @@ cc_test( ":parse", ":tree", "//testing/base:gtest_main", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:mocks", "//toolchain/lex", "//toolchain/lex:tokenized_buffer", @@ -80,7 +80,7 @@ cc_library( "//common:check", "//common:ostream", "//common:vlog", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:format_providers", "//toolchain/lex:token_kind", "//toolchain/lex:tokenized_buffer", @@ -109,7 +109,7 @@ cc_library( "//common:ostream", "//common:pretty_stack_trace_function", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:format_providers", "//toolchain/lex:token_index", "//toolchain/lex:token_kind", @@ -178,7 +178,7 @@ cc_test( "//common:raw_string_ostream", "//testing/base:gtest_main", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:mocks", "//toolchain/lex", "//toolchain/lex:tokenized_buffer", @@ -199,7 +199,7 @@ cc_fuzz_test( "//common:check", "//testing/fuzzing:libfuzzer_header", "//toolchain/base:shared_value_stores", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:null_diagnostics", "//toolchain/lex", "@llvm-project//llvm:Support", diff --git a/toolchain/parse/context.cpp b/toolchain/parse/context.cpp index b61009dd40b0..3bcdfa0bd134 100644 --- a/toolchain/parse/context.cpp +++ b/toolchain/parse/context.cpp @@ -10,7 +10,7 @@ #include "common/check.h" #include "common/ostream.h" #include "llvm/ADT/STLExtras.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/format_providers.h" #include "toolchain/lex/token_kind.h" #include "toolchain/lex/tokenized_buffer.h" diff --git a/toolchain/parse/parse.h b/toolchain/parse/parse.h index c266199bd550..3251ede659bb 100644 --- a/toolchain/parse/parse.h +++ b/toolchain/parse/parse.h @@ -6,7 +6,7 @@ #define CARBON_TOOLCHAIN_PARSE_PARSE_H_ #include "common/ostream.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/lex/tokenized_buffer.h" #include "toolchain/parse/tree.h" diff --git a/toolchain/parse/tree_test.cpp b/toolchain/parse/tree_test.cpp index 4c72661a3263..436210dca629 100644 --- a/toolchain/parse/tree_test.cpp +++ b/toolchain/parse/tree_test.cpp @@ -13,7 +13,7 @@ #include "common/raw_string_ostream.h" #include "toolchain/base/shared_value_stores.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/diagnostics/mocks.h" #include "toolchain/lex/lex.h" #include "toolchain/lex/tokenized_buffer.h" diff --git a/toolchain/sem_ir/BUILD b/toolchain/sem_ir/BUILD index c71f62ffd0b3..ade6f5c2cd4b 100644 --- a/toolchain/sem_ir/BUILD +++ b/toolchain/sem_ir/BUILD @@ -33,7 +33,7 @@ cc_library( "//toolchain/base:index_base", "//toolchain/base:int", "//toolchain/base:value_ids", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/parse:node_kind", "@llvm-project//llvm:Support", ], @@ -272,7 +272,7 @@ cc_library( ":absolute_node_id", ":file", ":typed_insts", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/parse:tree", "@llvm-project//clang:frontend", "@llvm-project//llvm:Support", diff --git a/toolchain/sem_ir/diagnostic_loc_converter.h b/toolchain/sem_ir/diagnostic_loc_converter.h index 8bf9ac3c83a8..7b952e2ab727 100644 --- a/toolchain/sem_ir/diagnostic_loc_converter.h +++ b/toolchain/sem_ir/diagnostic_loc_converter.h @@ -7,7 +7,7 @@ #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SmallVector.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/parse/tree_and_subtrees.h" #include "toolchain/sem_ir/absolute_node_id.h" #include "toolchain/sem_ir/file.h" diff --git a/toolchain/sem_ir/ids.h b/toolchain/sem_ir/ids.h index 479ed0ca1ec9..c78dc77a4014 100644 --- a/toolchain/sem_ir/ids.h +++ b/toolchain/sem_ir/ids.h @@ -12,7 +12,7 @@ #include "llvm/ADT/APFloat.h" #include "toolchain/base/index_base.h" #include "toolchain/base/value_ids.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" #include "toolchain/parse/node_ids.h" namespace Carbon::SemIR { diff --git a/toolchain/source/BUILD b/toolchain/source/BUILD index 65ce739f26a9..4e946ae1df71 100644 --- a/toolchain/source/BUILD +++ b/toolchain/source/BUILD @@ -12,7 +12,7 @@ cc_library( hdrs = ["source_buffer.h"], deps = [ "//common:error", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/diagnostics:file_diagnostics", "//toolchain/diagnostics:format_providers", "@llvm-project//llvm:Support", @@ -27,7 +27,7 @@ cc_test( ":source_buffer", "//common:check", "//testing/base:gtest_main", - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "@googletest//:gtest", "@llvm-project//llvm:Support", ], diff --git a/toolchain/source/source_buffer.h b/toolchain/source/source_buffer.h index 01a27697c3bb..af657c9e94a5 100644 --- a/toolchain/source/source_buffer.h +++ b/toolchain/source/source_buffer.h @@ -11,7 +11,7 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/VirtualFileSystem.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon { diff --git a/toolchain/source/source_buffer_test.cpp b/toolchain/source/source_buffer_test.cpp index 663b092b82b0..cc6f11807d6b 100644 --- a/toolchain/source/source_buffer_test.cpp +++ b/toolchain/source/source_buffer_test.cpp @@ -8,7 +8,7 @@ #include "common/check.h" #include "llvm/Support/VirtualFileSystem.h" -#include "toolchain/diagnostics/diagnostic_emitter.h" +#include "toolchain/diagnostics/emitter.h" namespace Carbon { namespace { diff --git a/toolchain/testing/BUILD b/toolchain/testing/BUILD index 7b3ac6012795..33af506c8acf 100644 --- a/toolchain/testing/BUILD +++ b/toolchain/testing/BUILD @@ -33,7 +33,7 @@ cc_library( srcs = ["compile_helper.cpp"], hdrs = ["compile_helper.h"], deps = [ - "//toolchain/diagnostics:diagnostic_emitter", + "//toolchain/diagnostics:emitter", "//toolchain/lex", "//toolchain/parse", "//toolchain/parse:tree", diff --git a/toolchain/testing/compile_helper.h b/toolchain/testing/compile_helper.h index 92500b5ee6b5..bd8994256cd3 100644 --- a/toolchain/testing/compile_helper.h +++ b/toolchain/testing/compile_helper.h @@ -8,7 +8,7 @@ #include #include "llvm/Support/VirtualFileSystem.h" -#include "toolchain/diagnostics/diagnostic_consumer.h" +#include "toolchain/diagnostics/consumer.h" #include "toolchain/lex/lex.h" #include "toolchain/parse/parse.h" #include "toolchain/parse/tree_and_subtrees.h"