[rust project] removing obsolete std libraries
These have been consolidated into other libs, and/or are no longer
part of the std lib distribution that's part of the rust compiler
distribution.
Change-Id: Ia913e0e7b46f06a7087fc6d7986a94b9c59b5ee4
Reviewed-on: https://gn-review.googlesource.com/c/gn/+/10080
Reviewed-by: Tyler Mandry <tmandry@google.com>
Reviewed-by: Paul Daniel Faria <paulfaria@google.com>
Commit-Queue: Aaron Wood <aaronwood@google.com>
diff --git a/src/gn/rust_project_writer.cc b/src/gn/rust_project_writer.cc
index e4ad28f..9134cd0 100644
--- a/src/gn/rust_project_writer.cc
+++ b/src/gn/rust_project_writer.cc
@@ -167,25 +167,11 @@
const std::string_view sysroot_crates[] = {"std",
"core",
"alloc",
- "collections",
- "libc",
"panic_unwind",
"proc_macro",
- "rustc_unicode",
- "std_unicode",
"test",
- "alloc_jemalloc",
- "alloc_system",
- "compiler_builtins",
- "getopts",
"panic_abort",
- "unwind",
- "build_helper",
- "rustc_asan",
- "rustc_lsan",
- "rustc_msan",
- "rustc_tsan",
- "syntax"};
+ "unwind"};
// Multiple sysroot crates have dependenices on each other. This provides a
// mechanism for specifiying that in an extendible manner.
diff --git a/src/gn/rust_project_writer_helpers_unittest.cc b/src/gn/rust_project_writer_helpers_unittest.cc
index 2685492..7ff3b48 100644
--- a/src/gn/rust_project_writer_helpers_unittest.cc
+++ b/src/gn/rust_project_writer_helpers_unittest.cc
@@ -103,25 +103,11 @@
"{\n"
" \"roots\": [\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/alloc/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/alloc_jemalloc/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/alloc_system/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/build_helper/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/collections/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/compiler_builtins/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/core/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/getopts/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/libc/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/panic_abort/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/panic_unwind/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/proc_macro/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_asan/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_lsan/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_msan/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_tsan/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_unicode/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/std/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/std_unicode/src/\",\n"
- " \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/syntax/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/test/src/\",\n"
" \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/unwind/src/\"\n"
" ],\n"
@@ -203,28 +189,6 @@
" },\n"
" {\n"
" \"crate_id\": 5,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/collections/src/lib.rs\",\n"
- " \"label\": \"collections\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 6,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/libc/src/lib.rs\",\n"
- " \"label\": \"libc\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 7,\n"
" \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/panic_unwind/src/lib.rs\",\n"
" \"label\": \"panic_unwind\",\n"
" \"deps\": [\n"
@@ -235,7 +199,7 @@
" ]\n"
" },\n"
" {\n"
- " \"crate_id\": 8,\n"
+ " \"crate_id\": 6,\n"
" \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/proc_macro/src/lib.rs\",\n"
" \"label\": \"proc_macro\",\n"
" \"deps\": [\n"
@@ -246,29 +210,7 @@
" ]\n"
" },\n"
" {\n"
- " \"crate_id\": 9,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_unicode/src/lib.rs\",\n"
- " \"label\": \"rustc_unicode\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 10,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/std_unicode/src/lib.rs\",\n"
- " \"label\": \"std_unicode\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 11,\n"
+ " \"crate_id\": 7,\n"
" \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/test/src/lib.rs\",\n"
" \"label\": \"test\",\n"
" \"deps\": [\n"
@@ -277,116 +219,6 @@
" \"cfg\": [\n"
" \"debug_assertions\"\n"
" ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 12,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/alloc_jemalloc/src/lib.rs\",\n"
- " \"label\": \"alloc_jemalloc\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 13,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/alloc_system/src/lib.rs\",\n"
- " \"label\": \"alloc_system\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 14,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/compiler_builtins/src/lib.rs\",\n"
- " \"label\": \"compiler_builtins\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 15,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/getopts/src/lib.rs\",\n"
- " \"label\": \"getopts\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 16,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/build_helper/src/lib.rs\",\n"
- " \"label\": \"build_helper\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 17,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_asan/src/lib.rs\",\n"
- " \"label\": \"rustc_asan\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 18,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_lsan/src/lib.rs\",\n"
- " \"label\": \"rustc_lsan\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 19,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_msan/src/lib.rs\",\n"
- " \"label\": \"rustc_msan\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 20,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/rustc_tsan/src/lib.rs\",\n"
- " \"label\": \"rustc_tsan\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
- " },\n"
- " {\n"
- " \"crate_id\": 21,\n"
- " \"root_module\": \"/root/out/Debug/sysroot/lib/rustlib/src/rust/library/syntax/src/lib.rs\",\n"
- " \"label\": \"syntax\",\n"
- " \"deps\": [\n"
- " ],\n"
- " \"edition\": \"2018\",\n"
- " \"cfg\": [\n"
- " \"debug_assertions\"\n"
- " ]\n"
" }\n"
" ]\n"
"}\n";
