Renumber library staging to match rustc dev guide

Author: dtolnay

BUCK

@@ -1843,7 +1843,7 @@ rust_bootstrap_library(
         ":rustc_arena-0.0.0",
         ":rustc_ast-0.0.0",
         ":rustc_ast_pretty-0.0.0",
-        ":rustc_attr_parsing-0.0.0",
+        ":rustc_attr_data_structures-0.0.0",
         ":rustc_data_structures-0.0.0",
         ":rustc_driver-0.0.0",
         ":rustc_errors-0.0.0",
@@ -1865,6 +1865,7 @@ rust_bootstrap_library(
         ":rustc_trait_selection-0.0.0",
         ":semver-1.0.26",
         ":serde-1.0.219",
+        ":smallvec-1.15.1",
         ":thin-vec-0.2.14",
         ":toml-0.7.8",
         ":unicode-normalization-0.1.24",
@@ -1913,10 +1914,12 @@ rust_bootstrap_library(
     visibility = [],
     deps = [
         ":arrayvec-0.7.6",
+        ":indexmap-2.10.0",
         ":itertools-0.12.1",
         ":rustc_abi-0.0.0",
         ":rustc_apfloat-0.2.3+llvm-462a31f5a5ab",
         ":rustc_ast-0.0.0",
+        ":rustc_attr_data_structures-0.0.0",
         ":rustc_attr_parsing-0.0.0",
         ":rustc_const_eval-0.0.0",
         ":rustc_data_structures-0.0.0",
@@ -11978,6 +11981,7 @@ rust_bootstrap_library(
         ":rustc_abi-0.0.0",
         ":rustc_ast-0.0.0",
         ":rustc_ast_pretty-0.0.0",
+        ":rustc_attr_data_structures-0.0.0",
         ":rustc_attr_parsing-0.0.0",
         ":rustc_data_structures-0.0.0",
         ":rustc_driver-0.0.0",

allocator/BUCK

@@ -32,6 +32,6 @@ alias(
         "//constraints:library": None,
         "//constraints:compiler": "//:allocator-api2",
     }),
-    default_target_platform = "//platforms/stage2:library",
+    default_target_platform = "//platforms/stage1:library",
     visibility = ["//:"],
 )

defs.bzl

@@ -23,7 +23,7 @@ def rust_bootstrap_binary(
     extra_rustc_flags = []
 
     if crate_root.startswith("rust/library/"):
-        default_target_platform = "//platforms/stage2:library-build-script"
+        default_target_platform = "//platforms/stage1:library-build-script"
     elif crate_root.startswith("rust/compiler/") or crate_root.startswith("rust/src/"):
         default_target_platform = "//platforms/stage1:compiler"
     else:
@@ -72,7 +72,7 @@ def rust_bootstrap_library(
     extra_srcs = []
 
     if crate_root.startswith("rust/library/"):
-        default_target_platform = "//platforms/stage2:library"
+        default_target_platform = "//platforms/stage1:library"
     elif crate_root.startswith("rust/compiler/") or crate_root.startswith("rust/src/"):
         default_target_platform = "//platforms/stage1:compiler"
         messages_ftl = glob(["rust/compiler/{}/messages.ftl".format(crate)])

fixups/clippy_lints/fixups.toml

@@ -4,7 +4,7 @@ extra_deps = [
     ":rustc_arena-0.0.0",
     ":rustc_ast-0.0.0",
     ":rustc_ast_pretty-0.0.0",
-    ":rustc_attr_parsing-0.0.0",
+    ":rustc_attr_data_structures-0.0.0",
     ":rustc_data_structures-0.0.0",
     ":rustc_driver-0.0.0",
     ":rustc_errors-0.0.0",
@@ -24,5 +24,6 @@ extra_deps = [
     ":rustc_span-0.0.0",
     ":rustc_target-0.0.0",
     ":rustc_trait_selection-0.0.0",
+    ":smallvec-1.15.1",
     ":thin-vec-0.2.14",
 ]

fixups/clippy_utils/fixups.toml

@@ -1,6 +1,8 @@
 extra_deps = [
+    ":indexmap-2.10.0",
     ":rustc_abi-0.0.0",
     ":rustc_ast-0.0.0",
+    ":rustc_attr_data_structures-0.0.0",
     ":rustc_attr_parsing-0.0.0",
     ":rustc_const_eval-0.0.0",
     ":rustc_data_structures-0.0.0",

fixups/rustdoc/fixups.toml

@@ -5,6 +5,7 @@ extra_deps = [
     ":rustc_abi-0.0.0",
     ":rustc_ast-0.0.0",
     ":rustc_ast_pretty-0.0.0",
+    ":rustc_attr_data_structures-0.0.0",
     ":rustc_attr_parsing-0.0.0",
     ":rustc_data_structures-0.0.0",
     ":rustc_driver-0.0.0",

platforms/BUCK

@@ -16,9 +16,11 @@ execution_platforms(
         ":host",
         "//platforms/stage1:compiler",
         "//platforms/stage1:compiler-build-script",
-        "//platforms/stage2:library",
-        "//platforms/stage2:library-build-script",
+        "//platforms/stage1:library",
+        "//platforms/stage1:library-build-script",
         "//platforms/stage2:compiler",
         "//platforms/stage2:compiler-build-script",
+        "//platforms/stage2:library",
+        "//platforms/stage2:library-build-script",
     ],
 )

platforms/stage1/BUCK

@@ -1,5 +1,27 @@
 load("//platforms:defs.bzl", "platform")
 
+platform(
+    name = "library",
+    base = "//platforms:host",
+    constraint_values = [
+        "//constraints:build-script=false",
+        "//constraints:library",
+        "//constraints:opt-level=3",
+        "//constraints:stage1",
+    ],
+    visibility = ["PUBLIC"],
+)
+
+platform(
+    name = "library-build-script",
+    base = ":library",
+    constraint_values = [
+        "//constraints:build-script=true",
+        "//constraints:opt-level=0",
+    ],
+    visibility = ["PUBLIC"],
+)
+
 platform(
     name = "compiler",
     base = "//platforms:host",

stage1/BUCK

@@ -1,4 +1,22 @@
-load(":defs.bzl", "SYSROOT_CRATES", "rust_tool")
+load("//constraints:defs.bzl", "transition_alias")
+load(":defs.bzl", "SYSROOT_CRATES", "rust_tool", "sysroot")
+
+[
+    transition_alias(
+        name = crate,
+        actual = "//:{}".format(crate),
+        incoming_transition = "//platforms/stage1:library",
+        visibility = ["PUBLIC"],
+    )
+    for crate in SYSROOT_CRATES
+]
+
+transition_alias(
+    name = "rust_allocator",
+    actual = "//allocator:rust_allocator",
+    incoming_transition = "//platforms/stage1:library",
+    visibility = ["toolchains//:rust"],
+)
 
 rust_tool(
     name = "rustc",
@@ -23,3 +41,10 @@ rust_tool(
     llvm = "//stage0:ci_llvm",
     visibility = ["toolchains//:rust"],
 )
+
+sysroot(
+    name = "sysroot",
+    incoming_transition = "//platforms/stage1:library",
+    visibility = ["toolchains//:rust"],
+    deps = [":std"],
+)

toolchains/BUCK

@@ -34,11 +34,15 @@ rust_toolchain(
         "rust//constraints:stage2": "rust//stage1:clippy-driver",
     }),
     compiler = select({
-        "rust//constraints:stage1": "rust//stage0:rustc",
-        "rust//constraints:stage2": select({
-            "rust//constraints:library": "rust//stage1:rustc",
+        "rust//constraints:stage1": select({
+            "rust//constraints:compiler": "rust//stage0:rustc",
             "rust//constraints:library-build-script": "rust//stage0:rustc",
+            "rust//constraints:library": "rust//stage1:rustc",
+        }),
+        "rust//constraints:stage2": select({
             "rust//constraints:compiler": "rust//stage1:rustc",
+            "rust//constraints:library-build-script": "rust//stage1:rustc",
+            "rust//constraints:library": "rust//stage2:rustc",
         }),
     }),
     exec_compatible_with = [
@@ -60,7 +64,10 @@ rust_toolchain(
             "rust//constraints:opt-level=3": "-Copt-level=3",
         }),
     ] + select({
-        "rust//constraints:stage1": ["--cfg=bootstrap"],
+        "rust//constraints:stage1": select({
+            "rust//constraints:compiler": ["--cfg=bootstrap"],
+            "rust//constraints:library": [],
+        }),
         "rust//constraints:stage2": [],
     }) + select({
         "DEFAULT": [],
@@ -72,19 +79,32 @@ rust_toolchain(
     }),
     sysroot = select({
         "rust//constraints:library": None,
-        "rust//constraints:library-build-script": "rust//stage0:sysroot",
+        "rust//constraints:library-build-script": select({
+            "rust//constraints:stage1": "rust//stage0:sysroot",
+            "rust//constraints:stage2": dict(
+                alloc = "rust//stage1:alloc",
+                compiler_builtins = "rust//stage1:compiler_builtins",
+                core = "rust//stage1:core",
+                panic_abort = "rust//stage1:panic_abort",
+                panic_unwind = "rust//stage1:panic_unwind",
+                proc_macro = "rust//stage1:proc_macro",
+                rust_allocator = "rust//stage1:rust_allocator",
+                std = "rust//stage1:std",
+                test = "rust//stage1:test",
+            ),
+        }),
         "rust//constraints:compiler": select({
             "rust//constraints:stage1": "rust//stage0:sysroot",
             "rust//constraints:stage2": dict(
-                alloc = "rust//stage2:alloc",
-                compiler_builtins = "rust//stage2:compiler_builtins",
-                core = "rust//stage2:core",
-                panic_abort = "rust//stage2:panic_abort",
-                panic_unwind = "rust//stage2:panic_unwind",
-                proc_macro = "rust//stage2:proc_macro",
-                rust_allocator = "rust//stage2:rust_allocator",
-                std = "rust//stage2:std",
-                test = "rust//stage2:test",
+                alloc = "rust//stage1:alloc",
+                compiler_builtins = "rust//stage1:compiler_builtins",
+                core = "rust//stage1:core",
+                panic_abort = "rust//stage1:panic_abort",
+                panic_unwind = "rust//stage1:panic_unwind",
+                proc_macro = "rust//stage1:proc_macro",
+                rust_allocator = "rust//stage1:rust_allocator",
+                std = "rust//stage1:std",
+                test = "rust//stage1:test",
             ),
         }),
     }),