Bootstrap source stdlib from rust-src

Author: dzbarsky

MODULE.bazel

@@ -58,7 +58,7 @@ bazel_dep(name = "protobuf", version = "34.0.bcr.1", repo_name = "com_google_pro
 bazel_dep(name = "rules_cc", version = "0.2.8")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_python", version = "1.6.3")
-bazel_dep(name = "llvm", version = "0.7.7")
+bazel_dep(name = "llvm", version = "0.8.0")
 bazel_dep(name = "aspect_tools_telemetry", version = "0.3.3")
 
 osx = use_extension("@llvm//extensions:osx.bzl", "osx")

MODULE.bazel.lock

@@ -89,19 +89,19 @@ def _uses_workspace_dependencies(cargo_toml_json):
     for spec in cargo_toml_json.get("dependencies", {}).values():
         if type(spec) == "dict" and spec.get("workspace") == True:
             return True
-
     for spec in cargo_toml_json.get("build-dependencies", {}).values():
         if type(spec) == "dict" and spec.get("workspace") == True:
             return True
-
-    for target in cargo_toml_json.get("target", {}).values():
-        for spec in target.get("dependencies", {}).values():
+    for value in cargo_toml_json.get("target", {}).values():
+        for spec in value.get("dependencies", {}).values():
+            if type(spec) == "dict" and spec.get("workspace") == True:
+                return True
+        for spec in value.get("build-dependencies", {}).values():
             if type(spec) == "dict" and spec.get("workspace") == True:
                 return True
-
     return False
 
-def _cargo_toml_fact(cargo_toml_json, annotation, workspace_cargo_toml_json, strip_prefix = ""):
+def _cargo_toml_fact(cargo_toml_json, annotation, workspace_cargo_toml_json, strip_prefix = None):
     if _uses_workspace_dependencies(cargo_toml_json):
         workspace = (workspace_cargo_toml_json or {}).get("workspace")
         if not workspace and annotation.workspace_cargo_toml != "Cargo.toml":
@@ -164,20 +164,21 @@ def _generate_hub_and_spokes(
     existing_facts = getattr(mctx, "facts", {}) or {}
     facts = {}
 
-    split_packages = split_lockfile_packages(
-        hub_name,
-        cargo_metadata,
-        workspace_cargo_toml_json,
-        all_packages,
+    workspace_root = _normalize_path(cargo_metadata["workspace_root"])
+    lockfile_package_info = split_lockfile_packages(
+        hub_name = hub_name,
+        cargo_metadata = cargo_metadata,
+        all_packages = all_packages,
+        workspace_cargo_toml = workspace_cargo_toml_json,
+        repo_root = workspace_root,
     )
-    packages = split_packages.packages
-    workspace_members = split_packages.workspace_members
+    workspace_members = lockfile_package_info.workspace_members
+    packages = lockfile_package_info.packages
 
     mctx.report_progress("Computing dependencies and features")
 
     facts_by_fq_crate = {}
-    for package_index in range(len(packages)):
-        package = packages[package_index]
+    for package in packages:
         name = package["name"]
         version = package["version"]
         source = package["source"]
@@ -238,7 +239,8 @@ def _generate_hub_and_spokes(
             mctx.watch(mctx.path(cargo_toml_path))
             annotation = annotation_for(annotations, name, package["version"])
             cargo_toml_json = run_toml2json(mctx, cargo_toml_path)
-            fact = _cargo_toml_fact(cargo_toml_json, annotation, {})
+
+            fact = _cargo_toml_fact(cargo_toml_json, annotation, workspace_cargo_toml_json, strip_prefix = "")
 
             facts[key] = json.encode(fact)
             package["strip_prefix"] = fact.get("strip_prefix", "")
@@ -276,9 +278,9 @@ def _generate_hub_and_spokes(
 
         facts_by_fq_crate[_fq_crate(name, version)] = fact
 
-    resolved_facts = resolve_package_facts(packages, facts_by_fq_crate, platform_triples)
-    feature_resolutions_by_fq_crate = resolved_facts.feature_resolutions_by_fq_crate
-    versions_by_name = resolved_facts.versions_by_name
+    package_fact_info = resolve_package_facts(packages, facts_by_fq_crate, platform_triples)
+    versions_by_name = package_fact_info.versions_by_name
+    feature_resolutions_by_fq_crate = package_fact_info.feature_resolutions_by_fq_crate
 
     # Only files in the current Bazel workspace can/should be watched, so check where our manifests are located.
     watch_manifests = cargo_lock_path.repo_name == ""

rs/extensions.bzl

@@ -1,8 +1,8 @@
 """Config settings for Rust target triples."""
 
-load("//rs/platforms:triples.bzl", "SUPPORTED_TARGET_TRIPLES", "triple_to_constraint_set")
+load("//rs/platforms:triples.bzl", "ALL_TARGET_TRIPLES", "triple_to_constraint_set")
 
-def declare_config_settings(targets = SUPPORTED_TARGET_TRIPLES):
+def declare_config_settings(targets = ALL_TARGET_TRIPLES):
     for target_triple in targets:
         native.config_setting(
             name = target_triple,

rs/platforms/config/declare_config_settings.bzl

@@ -1,8 +1,8 @@
 """Platform definitions for Rust target triples."""
 
-load("//rs/platforms:triples.bzl", "SUPPORTED_TARGET_TRIPLES", "triple_to_constraint_set")
+load("//rs/platforms:triples.bzl", "ALL_TARGET_TRIPLES", "triple_to_constraint_set")
 
-def declare_platforms(targets = SUPPORTED_TARGET_TRIPLES):
+def declare_platforms(targets = ALL_TARGET_TRIPLES):
     for target_triple in targets:
         native.platform(
             name = target_triple,

rs/platforms/declare_platforms.bzl

@@ -9,6 +9,10 @@ def triple_to_constraint_set(target_triple):
     t = triple(target_triple)
 
     if t.system in ("linux", "nixos"):
+        # TODO: Add LLVM constraint support for libc-less Linux builds.
+        # if t.abi == "none":
+        #     constraints.append("@llvm//constraints/libc:unconstrained")
+        # elif t.abi == "musl" or "musl" in target_triple:
         if t.abi == "musl" or "musl" in target_triple:
             # Rustc passes `-no-pie` on musl so make sure we align.
             constraints.append("@llvm//constraints/libc:musl")
@@ -36,7 +40,7 @@ SUPPORTED_EXEC_TRIPLES = [
 ]
 
 # See https://doc.rust-lang.org/beta/rustc/platform-support.html
-SUPPORTED_TARGET_TRIPLES = [
+SUPPORTED_TIER_1_AND_2_TRIPLES = [
     # Tier 1
     "aarch64-apple-darwin",  # ARM64 macOS (11.0+, Big Sur+)
     "aarch64-pc-windows-msvc",  # ARM64 Windows MSVC
@@ -142,6 +146,42 @@ SUPPORTED_TARGET_TRIPLES = [
     "x86_64-unknown-none",  # * Freestanding/bare-metal x86_64, softfloat
     #"x86_64-unknown-redox",             # ✓ Redox OS
     "x86_64-unknown-uefi",  # ? 64-bit UEFI
+]
 
-    # No Tier3 support.
+SUPPORTED_TIER_3_TRIPLES = [
+    "aarch64-unknown-freebsd",
+    "aarch64-unknown-netbsd",
+    "aarch64-unknown-nto-qnx710",
+    "aarch64-unknown-openbsd",
+    "arm64e-apple-darwin",
+    "arm64e-apple-ios",
+    "armv7-unknown-freebsd",
+    "armv7-unknown-netbsd-eabihf",
+    "bpfeb-unknown-none",
+    "bpfel-unknown-none",
+    "i386-apple-ios",
+    "i686-apple-darwin",
+    "i686-unknown-netbsd",
+    "i686-unknown-openbsd",
+    "powerpc-unknown-freebsd",
+    "powerpc-unknown-linux-musl",
+    "powerpc-unknown-netbsd",
+    "powerpc-unknown-openbsd",
+    "powerpc64-unknown-freebsd",
+    "powerpc64-unknown-openbsd",
+    "powerpc64le-unknown-freebsd",
+    "riscv64-linux-android",
+    "riscv64gc-unknown-freebsd",
+    "riscv64gc-unknown-fuchsia",
+    "riscv64gc-unknown-netbsd",
+    "riscv64gc-unknown-openbsd",
+    "s390x-unknown-linux-musl",
+    "sparc64-unknown-netbsd",
+    "sparc64-unknown-openbsd",
+    "wasm64-unknown-unknown",
+    # TODO: Enable once @llvm has constraint support for libc-less Linux builds.
+    # "x86_64-unknown-linux-none",
+    "x86_64-unknown-openbsd",
 ]
+
+ALL_TARGET_TRIPLES = SUPPORTED_TIER_1_AND_2_TRIPLES + SUPPORTED_TIER_3_TRIPLES

rs/platforms/triples.bzl

@@ -1,11 +1,36 @@
 load("@bazel_lib//:bzl_library.bzl", "bzl_library")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_setting")
+load("@rules_rust//rust:defs.bzl", "rust_stdlib_filegroup")
 load(":all_crate_deps_test.bzl", "all_crate_deps_tests")
+load(":cargo_workspace_graph_test.bzl", "cargo_workspace_graph_tests")
 load(":cfg_parser_test.bzl", "cfg_parser_tests")
 load(":lint_flags_test.bzl", "lint_flags_tests")
 load(":semver_test.bzl", "semver_select_tests")
 
+bool_setting(
+    name = "source_stdlib_building",
+    build_setting_default = False,
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "is_source_stdlib_building",
+    flag_values = {
+        ":source_stdlib_building": "true",
+    },
+    visibility = ["//visibility:public"],
+)
+
+rust_stdlib_filegroup(
+    name = "empty_stdlib",
+    srcs = [],
+    visibility = ["//visibility:public"],
+)
+
 all_crate_deps_tests()
 
+cargo_workspace_graph_tests()
+
 cfg_parser_tests()
 
 lint_flags_tests()
@@ -109,6 +134,13 @@ bzl_library(
     deps = ["@bazel_lib//lib:repo_utils"],
 )
 
+bzl_library(
+    name = "source_stdlib",
+    srcs = ["source_stdlib.bzl"],
+    visibility = ["//rs:__subpackages__"],
+    deps = ["@rules_rust//rust:bzl_lib"],
+)
+
 bzl_library(
     name = "git_cargo_workspace_repository",
     srcs = ["git_cargo_workspace_repository.bzl"],
@@ -126,6 +158,7 @@ bzl_library(
     srcs = ["cargo_repository.bzl"],
     visibility = ["//rs:__subpackages__"],
     deps = [
+        "//rs/private:rust_repository_utils",
         "@rules_rust//rust/platform:bzl_lib",
         "@rules_rust//rust/private:bzl_lib",
     ],
@@ -169,6 +202,11 @@ bzl_library(
     srcs = ["rust_src_repository.bzl"],
     visibility = ["//rs:__subpackages__"],
     deps = [
+        ":cargo_workspace_graph",
+        ":repository_utils",
+        ":toml2json",
+        "//rs/platforms:triples",
+        "@bazel_skylib//lib:paths",
         "@bazel_tools//tools/build_defs/repo:utils.bzl",
         "@rules_rust//rust/private:bzl_lib",
     ],