Move the toolchain into a top-level directory.

diagnostics/diagnostic_emitter.cpp → toolchain/diagnostics/diagnostic_emitter.cpp

@@ -2,6 +2,6 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "diagnostics/diagnostic_emitter.h"
+#include "toolchain/diagnostics/diagnostic_emitter.h"
 
 namespace Carbon {}  // namespace Carbon

diagnostics/diagnostic_emitter.h → toolchain/diagnostics/diagnostic_emitter.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef DIAGNOSTICS_DIAGNOSTICEMITTER_H_
-#define DIAGNOSTICS_DIAGNOSTICEMITTER_H_
+#ifndef TOOLCHAIN_DIAGNOSTICS_DIAGNOSTICEMITTER_H_
+#define TOOLCHAIN_DIAGNOSTICS_DIAGNOSTICEMITTER_H_
 
 #include <functional>
 #include <string>
@@ -174,4 +174,4 @@ class ErrorTrackingDiagnosticConsumer : public DiagnosticConsumer {
 
 }  // namespace Carbon
 
-#endif  // DIAGNOSTICS_DIAGNOSTICEMITTER_H_
+#endif  // TOOLCHAIN_DIAGNOSTICS_DIAGNOSTICEMITTER_H_

diagnostics/diagnostic_emitter_test.cpp → toolchain/diagnostics/diagnostic_emitter_test.cpp

@@ -2,13 +2,13 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "diagnostics/diagnostic_emitter.h"
+#include "toolchain/diagnostics/diagnostic_emitter.h"
 
-#include "diagnostics/mocks.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/FormatVariadic.h"
+#include "toolchain/diagnostics/mocks.h"
 
 namespace Carbon {
 namespace {

diagnostics/mocks.h → toolchain/diagnostics/mocks.h

@@ -2,11 +2,11 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef DIAGNOSTICS_MOCKS_H_
-#define DIAGNOSTICS_MOCKS_H_
+#ifndef TOOLCHAIN_DIAGNOSTICS_MOCKS_H_
+#define TOOLCHAIN_DIAGNOSTICS_MOCKS_H_
 
-#include "diagnostics/diagnostic_emitter.h"
 #include "gmock/gmock.h"
+#include "toolchain/diagnostics/diagnostic_emitter.h"
 
 namespace Carbon {
 namespace Testing {
@@ -54,4 +54,4 @@ auto DiagnosticShortName(Matcher&& inner_matcher) -> auto {
 }  // namespace Testing
 }  // namespace Carbon
 
-#endif  // DIAGNOSTICS_MOCKS_H_
+#endif  // TOOLCHAIN_DIAGNOSTICS_MOCKS_H_

diagnostics/null_diagnostics.h → toolchain/diagnostics/null_diagnostics.h

@@ -2,10 +2,10 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef DIAGNOSTICS_NULL_DIAGNOSTICS_H_
-#define DIAGNOSTICS_NULL_DIAGNOSTICS_H_
+#ifndef TOOLCHAIN_DIAGNOSTICS_NULL_DIAGNOSTICS_H_
+#define TOOLCHAIN_DIAGNOSTICS_NULL_DIAGNOSTICS_H_
 
-#include "diagnostics/diagnostic_emitter.h"
+#include "toolchain/diagnostics/diagnostic_emitter.h"
 
 namespace Carbon {
 
@@ -36,4 +36,4 @@ inline auto NullDiagnosticEmitter() -> DiagnosticEmitter<LocationT>& {
 
 }  // namespace Carbon
 
-#endif  // DIAGNOSTICS_NULL_DIAGNOSTICS_H_
+#endif  // TOOLCHAIN_DIAGNOSTICS_NULL_DIAGNOSTICS_H_

driver/BUILD → toolchain/driver/BUILD

@@ -13,9 +13,9 @@ cc_library(
     hdrs = ["driver.h"],
     textual_hdrs = ["flags.def"],
     deps = [
-        "//diagnostics:diagnostic_emitter",
-        "//lexer:tokenized_buffer",
-        "//source:source_buffer",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/lexer:tokenized_buffer",
+        "//toolchain/source:source_buffer",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -25,7 +25,7 @@ cc_test(
     srcs = ["driver_test.cpp"],
     deps = [
         ":driver",
-        "//lexer:tokenized_buffer_test_helpers",
+        "//toolchain/lexer:tokenized_buffer_test_helpers",
         "@llvm-project//llvm:Support",
         "@llvm-project//llvm:gmock",
         "@llvm-project//llvm:gtest",

driver/driver.cpp → toolchain/driver/driver.cpp

@@ -2,33 +2,33 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "driver/driver.h"
+#include "toolchain/driver/driver.h"
 
-#include "diagnostics/diagnostic_emitter.h"
-#include "lexer/tokenized_buffer.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
-#include "source/source_buffer.h"
+#include "toolchain/diagnostics/diagnostic_emitter.h"
+#include "toolchain/lexer/tokenized_buffer.h"
+#include "toolchain/source/source_buffer.h"
 
 namespace Carbon {
 
 namespace {
 
 enum class Subcommand {
 #define CARBON_SUBCOMMAND(Name, ...) Name,
-#include "driver/flags.def"
+#include "toolchain/driver/flags.def"
   Unknown,
 };
 
 auto GetSubcommand(llvm::StringRef name) -> Subcommand {
   return llvm::StringSwitch<Subcommand>(name)
 #define CARBON_SUBCOMMAND(Name, Spelling, ...) .Case(Spelling, Subcommand::Name)
-#include "driver/flags.def"
+#include "toolchain/driver/flags.def"
       .Default(Subcommand::Unknown);
 }
 
@@ -52,7 +52,7 @@ auto Driver::RunFullCommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
 #define CARBON_SUBCOMMAND(Name, ...) \
   case Subcommand::Name:             \
     return Run##Name##Subcommand(subcommand_args);
-#include "driver/flags.def"
+#include "toolchain/driver/flags.def"
   }
   llvm_unreachable("All subcommands handled!");
 }
@@ -69,7 +69,7 @@ auto Driver::RunHelpSubcommand(llvm::ArrayRef<llvm::StringRef> args) -> bool {
 
   constexpr llvm::StringLiteral SubcommandsAndHelp[][2] = {
 #define CARBON_SUBCOMMAND(Name, Spelling, HelpText) {Spelling, HelpText},
-#include "driver/flags.def"
+#include "toolchain/driver/flags.def"
   };
 
   int max_subcommand_width = 0;

driver/driver.h → toolchain/driver/driver.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef DRIVER_DRIVER_H_
-#define DRIVER_DRIVER_H_
+#ifndef TOOLCHAIN_DRIVER_DRIVER_H_
+#define TOOLCHAIN_DRIVER_DRIVER_H_
 
 #include <cstdint>
 
@@ -67,4 +67,4 @@ class Driver {
 
 }  // namespace Carbon
 
-#endif  // DRIVER_DRIVER_H_
+#endif  // TOOLCHAIN_DRIVER_DRIVER_H_

driver/driver_fuzzer.cpp → toolchain/driver/driver_fuzzer.cpp

@@ -7,10 +7,10 @@
 #include <numeric>
 #include <string>
 
-#include "driver/driver.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
+#include "toolchain/driver/driver.h"
 
 namespace Carbon {
 

driver/driver_main.cpp → toolchain/driver/driver_main.cpp

@@ -4,10 +4,10 @@
 
 #include <cstdlib>
 
-#include "driver/driver.h"
 #include "llvm/ADT/Sequence.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "toolchain/driver/driver.h"
 
 auto main(int argc, char** argv) -> int {
   if (argc < 1) {

driver/driver_test.cpp → toolchain/driver/driver_test.cpp

@@ -2,15 +2,15 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#include "driver/driver.h"
+#include "toolchain/driver/driver.h"
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "lexer/tokenized_buffer_test_helpers.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/Support/YAMLParser.h"
+#include "toolchain/lexer/tokenized_buffer_test_helpers.h"
 
 namespace Carbon {
 namespace {
@@ -78,7 +78,7 @@ TEST(DriverTest, Help) {
   // Help text should mention each subcommand.
 #define CARBON_SUBCOMMAND(Name, Spelling, ...) \
   EXPECT_THAT(help_text, HasSubstr(Spelling));
-#include "driver/flags.def"
+#include "toolchain/driver/flags.def"
 
   // Check that the subcommand dispatch works.
   EXPECT_TRUE(driver.RunFullCommand({"help"}));

lexer/BUILD → toolchain/lexer/BUILD

@@ -37,7 +37,7 @@ cc_library(
     testonly = 1,
     hdrs = ["test_helpers.h"],
     deps = [
-        "//diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -48,7 +48,7 @@ cc_library(
     hdrs = ["numeric_literal.h"],
     deps = [
         ":character_set",
-        "//diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -59,7 +59,7 @@ cc_test(
     deps = [
         ":numeric_literal",
         ":test_helpers",
-        "//diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
         "@llvm-project//llvm:gmock",
         "@llvm-project//llvm:gtest",
@@ -73,8 +73,8 @@ cc_fuzz_test(
     corpus = glob(["fuzzer_corpus/numeric_literal/*"]),
     deps = [
         ":numeric_literal",
-        "//diagnostics:diagnostic_emitter",
-        "//diagnostics:null_diagnostics",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:null_diagnostics",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -85,7 +85,7 @@ cc_library(
     hdrs = ["string_literal.h"],
     deps = [
         ":character_set",
-        "//diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -96,7 +96,7 @@ cc_test(
     deps = [
         ":string_literal",
         ":test_helpers",
-        "//diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
         "@llvm-project//llvm:gmock",
         "@llvm-project//llvm:gtest",
@@ -110,8 +110,8 @@ cc_fuzz_test(
     corpus = glob(["fuzzer_corpus/string_literal/*"]),
     deps = [
         ":string_literal",
-        "//diagnostics:diagnostic_emitter",
-        "//diagnostics:null_diagnostics",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:null_diagnostics",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -125,8 +125,8 @@ cc_library(
         ":numeric_literal",
         ":string_literal",
         ":token_kind",
-        "//diagnostics:diagnostic_emitter",
-        "//source:source_buffer",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/source:source_buffer",
         "@llvm-project//llvm:Support",
     ],
 )
@@ -148,8 +148,8 @@ cc_test(
     deps = [
         ":tokenized_buffer",
         ":tokenized_buffer_test_helpers",
-        "//diagnostics:diagnostic_emitter",
-        "//diagnostics:mocks",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:mocks",
         "@llvm-project//llvm:Support",
         "@llvm-project//llvm:gmock",
         "@llvm-project//llvm:gtest",
@@ -163,8 +163,8 @@ cc_fuzz_test(
     corpus = glob(["fuzzer_corpus/tokenized_buffer/*"]),
     deps = [
         ":tokenized_buffer",
-        "//diagnostics:diagnostic_emitter",
-        "//diagnostics:null_diagnostics",
+        "//toolchain/diagnostics:diagnostic_emitter",
+        "//toolchain/diagnostics:null_diagnostics",
         "@llvm-project//llvm:Support",
     ],
 )

lexer/character_set.h → toolchain/lexer/character_set.h

@@ -2,8 +2,8 @@
 // Exceptions. See /LICENSE for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-#ifndef LEXER_CHARACTER_SET_H_
-#define LEXER_CHARACTER_SET_H_
+#ifndef TOOLCHAIN_LEXER_CHARACTER_SET_H_
+#define TOOLCHAIN_LEXER_CHARACTER_SET_H_
 
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringRef.h"
@@ -72,4 +72,4 @@ inline bool IsSpace(char c) {
 
 }  // namespace Carbon
 
-#endif  // LEXER_CHARACTER_SET_H_
+#endif  // TOOLCHAIN_LEXER_CHARACTER_SET_H_