From a9c70c1057ad923b541a472cd57e07d0a34e67b3 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 15 Dec 2020 16:27:31 -0800 Subject: [PATCH] Clean up references to the `carbon-toolchain` repository. (#226) Now that we've centralized on a monorepo, tidy up some lingering references. For the `pr_comments.py` script, I've left the flag in place to select a repository as it seems useful functionality to have available even if we don't expect to need it in the near term. That said, I can pull it out if folks prefer. I haven't updated any of the *proposals* because it seems better to leave those as-is from when they were written. The references seem unlikely to be confusing to me. Happy for suggestions if needed there though. Co-authored-by: Jon Meow <46229924+jonmeow@users.noreply.github.com> --- README.md | 8 -------- docs/design/code_and_name_organization/README.md | 3 +-- github_tools/pr_comments.py | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6f71c7187558..5600e891db08 100644 --- a/README.md +++ b/README.md @@ -136,11 +136,3 @@ compatibility and interoperability with C++: the language as well as large-scale migration for users.** This is extremely expensive, and so the bar for Carbon to be a compelling direction for C++ is very high. - -## Repository structure overview - -Carbon's main repositories are: - -- **carbon-lang** - Carbon language specification and documentation. -- **carbon-toolchain** - Carbon language toolchain and reference - implementation. diff --git a/docs/design/code_and_name_organization/README.md b/docs/design/code_and_name_organization/README.md index cf7fb413ac48..0e3daec52c46 100644 --- a/docs/design/code_and_name_organization/README.md +++ b/docs/design/code_and_name_organization/README.md @@ -839,8 +839,7 @@ Advantages: - Allow greater flexibility and hierarchy for related packages, such as `Database.Client` and `Database.Server`. - Would allow using GitHub repository names as package names. For example, - `carbon-language/carbon-toolchain` could become - `carbon_language.carbon_toolchain`. + `carbon-language/carbon-lang` could become `carbon_language.carbon_lang`. Disadvantages: diff --git a/github_tools/pr_comments.py b/github_tools/pr_comments.py index 2363c0ffc532..0d136fbba96f 100755 --- a/github_tools/pr_comments.py +++ b/github_tools/pr_comments.py @@ -285,7 +285,7 @@ def _parse_args(args=None): ) parser.add_argument( "--repo", - choices=["carbon-lang", "carbon-toolchain"], + choices=["carbon-lang"], default="carbon-lang", help="The Carbon repo to query. Defaults to %(default)s.", )