Rename lexer dir to lex (#3179)

Continuing with #3070. Just a dir and file rename (only prefix change is
lexer_file_test). Everything in the lex dir should be marked as a move.

Note, I think this closes #3070. There may still be further cleanup
later, but the organizational changes suggested there are being
completed.

---------

Co-authored-by: Chandler Carruth <chandlerc@gmail.com>

language_server/BUILD

@@ -20,7 +20,7 @@ cc_binary(
     deps = [
         "//common:error",
         "//toolchain/diagnostics:null_diagnostics",
-        "//toolchain/lexer:tokenized_buffer",
+        "//toolchain/lex:tokenized_buffer",
         "//toolchain/parse:node_kind",
         "//toolchain/parse:tree",
         "//toolchain/source:source_buffer",

language_server/language_server.cpp

@@ -6,7 +6,7 @@
 
 #include "clang-tools-extra/clangd/Protocol.h"
 #include "toolchain/diagnostics/null_diagnostics.h"
-#include "toolchain/lexer/tokenized_buffer.h"
+#include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/parse/node_kind.h"
 #include "toolchain/parse/tree.h"
 #include "toolchain/source/source_buffer.h"

language_server/language_server.h

@@ -11,7 +11,7 @@
 #include "clang-tools-extra/clangd/Protocol.h"
 #include "clang-tools-extra/clangd/Transport.h"
 #include "clang-tools-extra/clangd/support/Function.h"
-#include "toolchain/lexer/tokenized_buffer.h"
+#include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/parse/tree.h"
 #include "toolchain/source/source_buffer.h"
 

toolchain/autoupdate_testdata.py

@@ -15,7 +15,7 @@ TARGETS = {
     "check": "//toolchain/check:check_file_test",
     "codegen": "//toolchain/codegen:codegen_file_test",
     "driver": "//toolchain/driver:driver_file_test",
-    "lexer": "//toolchain/lexer:lexer_file_test",
+    "lex": "//toolchain/lex:lex_file_test",
     "lower": "//toolchain/lower:lower_file_test",
     "parse": "//toolchain/parse:parse_file_test",
 }

toolchain/check/BUILD

@@ -50,7 +50,7 @@ cc_library(
         "//toolchain/base:pretty_stack_trace_function",
         "//toolchain/diagnostics:diagnostic_emitter",
         "//toolchain/diagnostics:diagnostic_kind",
-        "//toolchain/lexer:tokenized_buffer",
+        "//toolchain/lex:tokenized_buffer",
         "//toolchain/parse:node_kind",
         "//toolchain/parse:tree",
         "//toolchain/parse:tree_node_location_translator",

toolchain/check/check.h

@@ -7,7 +7,7 @@
 
 #include "common/ostream.h"
 #include "toolchain/diagnostics/diagnostic_emitter.h"
-#include "toolchain/lexer/tokenized_buffer.h"
+#include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/parse/tree.h"
 #include "toolchain/sem_ir/file.h"
 

toolchain/check/context.cpp

@@ -12,7 +12,7 @@
 #include "toolchain/check/declaration_name_stack.h"
 #include "toolchain/check/node_block_stack.h"
 #include "toolchain/diagnostics/diagnostic_kind.h"
-#include "toolchain/lexer/tokenized_buffer.h"
+#include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/parse/node_kind.h"
 #include "toolchain/sem_ir/file.h"
 #include "toolchain/sem_ir/node.h"

toolchain/driver/BUILD

@@ -21,7 +21,7 @@ cc_library(
         "//toolchain/codegen",
         "//toolchain/diagnostics:diagnostic_emitter",
         "//toolchain/diagnostics:sorting_diagnostic_consumer",
-        "//toolchain/lexer:tokenized_buffer",
+        "//toolchain/lex:tokenized_buffer",
         "//toolchain/lower",
         "//toolchain/parse:tree",
         "//toolchain/sem_ir:file",
@@ -53,7 +53,7 @@ cc_test(
         "//testing/base:test_raw_ostream",
         "//toolchain/base:yaml_test_helpers",
         "//toolchain/diagnostics:diagnostic_emitter",
-        "//toolchain/lexer:tokenized_buffer_test_helpers",
+        "//toolchain/lex:tokenized_buffer_test_helpers",
         "@com_google_googletest//:gtest",
         "@llvm-project//llvm:Object",
         "@llvm-project//llvm:Support",

toolchain/driver/driver.cpp

@@ -16,7 +16,7 @@
 #include "toolchain/codegen/codegen.h"
 #include "toolchain/diagnostics/diagnostic_emitter.h"
 #include "toolchain/diagnostics/sorting_diagnostic_consumer.h"
-#include "toolchain/lexer/tokenized_buffer.h"
+#include "toolchain/lex/tokenized_buffer.h"
 #include "toolchain/lower/lower.h"
 #include "toolchain/parse/tree.h"
 #include "toolchain/sem_ir/formatter.h"

toolchain/lexer/BUILD → toolchain/lex/BUILD

@@ -40,9 +40,9 @@ cc_library(
 )
 
 cc_library(
-    name = "lex_helpers",
-    srcs = ["lex_helpers.cpp"],
-    hdrs = ["lex_helpers.h"],
+    name = "helpers",
+    srcs = ["helpers.cpp"],
+    hdrs = ["helpers.h"],
     deps = [
         "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
@@ -68,7 +68,7 @@ cc_library(
     hdrs = ["numeric_literal.h"],
     deps = [
         ":character_set",
-        ":lex_helpers",
+        ":helpers",
         "//common:check",
         "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
@@ -122,7 +122,7 @@ cc_library(
     hdrs = ["string_literal.h"],
     deps = [
         ":character_set",
-        ":lex_helpers",
+        ":helpers",
         "//common:check",
         "//toolchain/diagnostics:diagnostic_emitter",
         "@llvm-project//llvm:Support",
@@ -176,7 +176,7 @@ cc_library(
     hdrs = ["tokenized_buffer.h"],
     deps = [
         ":character_set",
-        ":lex_helpers",
+        ":helpers",
         ":numeric_literal",
         ":string_literal",
         ":token_kind",
@@ -249,8 +249,8 @@ cc_binary(
 )
 
 file_test(
-    name = "lexer_file_test",
-    srcs = ["lexer_file_test.cpp"],
+    name = "lex_file_test",
+    srcs = ["lex_file_test.cpp"],
     tests = glob(["testdata/**/*.carbon"]),
     deps = [
         "//toolchain/driver:driver_file_test_base",

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

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