Merge branch 'main' into coverage-rbe

Author: UebelAndre

.github/workflows/release.yaml

@@ -6,6 +6,7 @@ on:
     branches:
       - main
     paths:
+      - crate_universe/tools/cross_installer/**
       - version.bzl
       - .github/workflows/release.yaml
   push:

crate_universe/extensions.bzl

@@ -1161,7 +1161,7 @@ def _crate_impl(module_ctx):
                 manifests = {str(module_ctx.path(m)): str(m) for m in cfg.manifests}
 
             packages = {
-                p.package: _package_to_json(p)
+                p.package_alias or p.package: _package_to_json(p)
                 for p in common_specs + repo_specific_specs.get(cfg.name, [])
             }
 
@@ -1431,6 +1431,9 @@ _spec = tag_class(
             doc = "The explicit name of the package.",
             mandatory = True,
         ),
+        "package_alias": attr.string(
+            doc = "Alias for the package.",
+        ),
         "path": attr.string(
             doc = "The local path of the remote crate. Cannot be used with `version` or `git`.",
         ),

crate_universe/private/crates_repository.bzl

@@ -139,8 +139,9 @@ def _crates_repository_impl(repository_ctx):
     # Determine the set of reproducible values
     attrs = {attr: getattr(repository_ctx.attr, attr) for attr in dir(repository_ctx.attr)}
     exclude = ["to_json", "to_proto"]
-    for attr in exclude:
-        attrs.pop(attr, None)
+    for attr in list(attrs.keys()):
+        if attr in exclude or attr.startswith("_"):
+            attrs.pop(attr, None)
 
     # Note that this is only scoped to the current host platform. Users should
     # ensure they provide all the values necessary for the host environments

crate_universe/tools/cross_installer/cross_installer_deps.bzl

@@ -23,14 +23,10 @@ def cross_installer_deps(**kwargs):
         http_archive,
         name = "cross_rs",
         # v0.2.5+
-        urls = ["https://github.com/cross-rs/cross/archive/4090beca3cfffa44371a5bba524de3a578aa46c3.zip"],
-        strip_prefix = "cross-4090beca3cfffa44371a5bba524de3a578aa46c3",
-        integrity = "sha256-9lo/wRsDWdaTzt3kVSBWRfNp+DXeDZqrG3Z+10mE+fo=",
+        urls = ["https://github.com/cross-rs/cross/archive/588b3c99db52b5a9c5906fab96cfadcf1bde7863.zip"],
+        strip_prefix = "cross-588b3c99db52b5a9c5906fab96cfadcf1bde7863",
+        integrity = "sha256-5LqzALSHMZGDtTLMk94fGa6oexMfoi3YjlbivVstMXU=",
         build_file_content = """exports_files(["Cargo.toml", "Cargo.lock"], visibility = ["//visibility:public"])""",
-        patch_args = ["-p1"],
-        patches = [
-            Label("//crate_universe/tools/cross_installer/patches:cross_rs.static_mut_refs.patch"),
-        ],
     )
 
     direct_deps.append(struct(

crate_universe/tools/cross_installer/patches/BUILD.bazel

@@ -515,6 +515,13 @@ no_cargo.spec(
     repositories = ["no_cargo"],
     version = "0.4",
 )
+no_cargo.spec(
+    features = ["util"],
+    package = "tower",
+    package_alias = "tower_new",  # used in package_alias test
+    repositories = ["no_cargo"],
+    version = "0.5.3",
+)
 no_cargo.spec(
     features = ["trace"],
     package = "tower-http",

crate_universe/tools/cross_installer/patches/README.md

@@ -0,0 +1,4 @@
+alias(
+    name = "tower-new",
+    actual = "@no_cargo//:tower_new",  # ensures the package_alias works
+)

crate_universe/tools/cross_installer/patches/cross_rs.static_mut_refs.patch

@@ -53,13 +53,13 @@ crates_vendor(
                 "extension-module",
                 "experimental-inspect",
             ],
-            version = "0.26.0",
+            version = "0.28.2",
         ),
         "pyo3-ffi": crate.spec(
-            version = "0.26.0",
+            version = "0.28.2",
         ),
         "pyo3-introspection": crate.spec(
-            version = "0.26.0",
+            version = "0.28.2",
         ),
     },
     # Name is short to avoid windows paths being too long