Merge branch 'main' into rustup

Author: UebelAndre

crate_universe/extensions.bzl

@@ -373,7 +373,7 @@ There are some more examples of using crate_universe with bzlmod in the [example
 
 load("@bazel_features//:features.bzl", "bazel_features")
 load("@bazel_skylib//lib:structs.bzl", "structs")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(
     "//crate_universe/private:common_utils.bzl",
@@ -758,7 +758,7 @@ def _generate_hub_and_spokes(
                     kwargs["commit"] = v
                 else:
                     kwargs[k.lower()] = v
-            new_git_repository(
+            git_repository(
                 name = crate_repo_name,
                 init_submodules = True,
                 patch_args = repo.get("patch_args", None),

crate_universe/private/crates_repository.bzl

@@ -49,6 +49,13 @@ def _crates_repository_impl(repository_ctx):
     # Locate the lockfiles
     lockfiles = get_lockfiles(repository_ctx)
 
+    # Watch lockfiles and manifests for changes.
+    repository_ctx.watch(lockfiles.cargo)
+    if lockfiles.bazel:
+        repository_ctx.watch(lockfiles.bazel)
+    for m in repository_ctx.attr.manifests:
+        repository_ctx.watch(repository_ctx.path(m))
+
     # Locate Rust tools (cargo, rustc)
     tools = get_rust_tools(repository_ctx, host_triple)
     cargo_path = repository_ctx.path(tools.cargo)

crate_universe/src/config.rs

@@ -345,7 +345,7 @@ pub(crate) struct CrateAnnotations {
     pub(crate) additive_build_file_content: Option<String>,
 
     /// For git sourced crates, this is a the
-    /// [git_repository::shallow_since](https://docs.bazel.build/versions/main/repo/git.html#new_git_repository-shallow_since) attribute.
+    /// [git_repository::shallow_since](https://docs.bazel.build/versions/main/repo/git.html#git_repository-shallow_since) attribute.
     pub(crate) shallow_since: Option<String>,
 
     /// The `patch_args` attribute of a Bazel repository rule. See

crate_universe/src/rendering/templates/module_bzl.j2

@@ -14,7 +14,7 @@ Expected length = 6 lines
 
 """
 
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("@bazel_skylib//lib:selects.bzl", "selects")

crate_universe/src/rendering/templates/partials/module/repo_git.j2

@@ -1,5 +1,5 @@
     maybe(
-        new_git_repository,
+        git_repository,
         name = "{{ crate_repository(name = crate.name, version = crate.version) }}",
     {%- for type, commitish in attrs.commitish %}
     {%- if type in ["Rev"] %}

rust/platform/triple_mappings.bzl

@@ -210,12 +210,12 @@ _SYSTEM_TO_STATICLIB_EXT = {
     "nixos": ".a",
     "none": ".a",
     "nto": ".a",
-    "threads": "",
+    "threads": ".a",
     "uefi": ".lib",
-    "unknown": "",
-    "wasi": "",
-    "wasip1": "",
-    "wasip2": "",
+    "unknown": ".a",
+    "wasi": ".a",
+    "wasip1": ".a",
+    "wasip2": ".a",
     "windows": ".lib",
 }
 

test/unit/platform_triple/platform_triple_test.bzl

@@ -2,7 +2,7 @@
 
 load("@bazel_skylib//lib:unittest.bzl", "asserts", "unittest")
 load("//rust/platform:triple.bzl", "triple")
-load("//rust/platform:triple_mappings.bzl", "SUPPORTED_PLATFORM_TRIPLES")
+load("//rust/platform:triple_mappings.bzl", "SUPPORTED_PLATFORM_TRIPLES", "system_to_staticlib_ext")
 
 def _construct_platform_triple_test_impl(ctx):
     env = unittest.begin(ctx)
@@ -152,10 +152,24 @@ def _construct_known_triples_test_impl(ctx):
 
     return unittest.end(env)
 
+def _wasm_staticlib_ext_test_impl(ctx):
+    env = unittest.begin(ctx)
+
+    for system in ["threads", "unknown", "wasi", "wasip1", "wasip2"]:
+        asserts.equals(
+            env,
+            ".a",
+            system_to_staticlib_ext(system),
+            "{} should use a static archive extension".format(system),
+        )
+
+    return unittest.end(env)
+
 construct_platform_triple_test = unittest.make(_construct_platform_triple_test_impl)
 construct_minimal_platform_triple_test = unittest.make(_construct_minimal_platform_triple_test_impl)
 supported_platform_triples_test = unittest.make(_supported_platform_triples_test_impl)
 construct_known_triples_test = unittest.make(_construct_known_triples_test_impl)
+wasm_staticlib_ext_test = unittest.make(_wasm_staticlib_ext_test_impl)
 
 def platform_triple_test_suite(name, **kwargs):
     """Define a test suite for testing the `triple` constructor
@@ -176,6 +190,9 @@ def platform_triple_test_suite(name, **kwargs):
     construct_known_triples_test(
         name = "construct_known_triples_test",
     )
+    wasm_staticlib_ext_test(
+        name = "wasm_staticlib_ext_test",
+    )
 
     native.test_suite(
         name = name,
@@ -184,6 +201,7 @@ def platform_triple_test_suite(name, **kwargs):
             ":construct_minimal_platform_triple_test",
             ":supported_platform_triples_test",
             ":construct_known_triples_test",
+            ":wasm_staticlib_ext_test",
         ],
         **kwargs
     )