Bump rules_rust to pick up working rust_doc_test (#115)

Author: dzbarsky

rs/rules_rust.bzl

@@ -31,9 +31,9 @@ def _rules_rust_impl(mctx):
 
     http_archive(
         name = "rules_rust",
-        integrity = "sha256-cgcEczGYnZ2eievIbjKeHbx8IgadpgE+pqCP5T9KfpI=",
-        strip_prefix = "rules_rust-f219b67063621df3478da66b45be30f67031254b",
-        url = "https://github.com/hermeticbuild/rules_rust/archive/f219b67063621df3478da66b45be30f67031254b.tar.gz",
+        integrity = "sha256-SylkBtg4Bb5Mz2Dr3EMw6wwV70eB4SzstsejNEAl+wE=",
+        strip_prefix = "rules_rust-37c7e7461a10d6e244f67fc96657e639fe8e034f",
+        url = "https://github.com/hermeticbuild/rules_rust/archive/37c7e7461a10d6e244f67fc96657e639fe8e034f.tar.gz",
         patches = patches,
         patch_strip = strip,
     )

rs/tests/BUILD.bazel

@@ -1,13 +1,17 @@
 load("@bazel_lib//lib:transitions.bzl", "platform_transition_filegroup")
 load("@build_script_aliases//:data.bzl", build_script_aliases_dep_data = "DEP_DATA")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_rs//rs:rust_binary.bzl", "rust_binary")
+load("@rules_rs//rs:rust_library.bzl", "rust_library")
+load("@rules_rust//rust:defs.bzl", "rust_doc_test")
 load("@rules_shell//shell:sh_test.bzl", "sh_test")
 load("@self_dev_dependency//:data.bzl", self_dev_dependency_dep_data = "DEP_DATA")
 load("@self_dev_dependency//:defs.bzl", self_dev_dependency_aliases = "aliases")
 load("@target_workspace_dep_feature//:data.bzl", target_workspace_dep_feature_dep_data = "DEP_DATA")
 load("@workspace_default_features//:data.bzl", workspace_default_features_dep_data = "DEP_DATA")
 load("@workspace_hyphen_dep_aliases//:defs.bzl", workspace_hyphen_dep_aliases_aliases = "aliases")
 load("@workspace_renamed_path_dep_aliases//:defs.bzl", workspace_renamed_path_dep_aliases_aliases = "aliases")
+load("//:rustdoc_musl_unwind_test.bzl", "rustdoc_musl_unwind_link_flags_test")
 load("//:verify_aliases.bzl", "verify_alias", "verify_alias_absent", "verify_crate_feature_absent", "verify_crate_feature_present", "verify_dep_absent", "verify_dep_present", "verify_dev_dep_absent")
 
 sh_test(
@@ -19,6 +23,30 @@ sh_test(
     }),
 )
 
+cc_library(
+    name = "rustdoc_musl_unwind_cc",
+    srcs = ["rustdoc_musl_unwind.cc"],
+)
+
+rust_library(
+    name = "rustdoc_musl_unwind",
+    srcs = ["rustdoc_musl_unwind.rs"],
+    crate_name = "rustdoc_musl_unwind",
+    edition = "2021",
+    deps = [":rustdoc_musl_unwind_cc"],
+)
+
+rust_doc_test(
+    name = "rustdoc_musl_unwind_doctest",
+    crate = ":rustdoc_musl_unwind",
+    tags = ["manual"],
+)
+
+rustdoc_musl_unwind_link_flags_test(
+    name = "rustdoc_musl_unwind_link_flags_test",
+    target_under_test = ":rustdoc_musl_unwind_doctest",
+)
+
 DISABLED = [
     "annotation_crate_features",
     "3rd_party",

test/BUILD.bazel

@@ -66,6 +66,7 @@ register_toolchains("@llvm//toolchain:all")
 
 bazel_dep(name = "rules_python", version = "1.7.0")
 bazel_dep(name = "rules_shell", version = "0.6.1")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "aspect_bazel_lib", version = "2.19.3")
 bazel_dep(name = "bazel_lib", version = "3.2.2")

test/MODULE.bazel

@@ -0,0 +1,7 @@
+extern "C" int rustdoc_musl_unwind_value() {
+    try {
+        throw 430;
+    } catch (int value) {
+        return value;
+    }
+}

test/rustdoc_musl_unwind.cc

@@ -0,0 +1,11 @@
+//! ```
+//! assert_eq!(rustdoc_musl_unwind::unwind_value(), 430);
+//! ```
+
+extern "C" {
+    fn rustdoc_musl_unwind_value() -> i32;
+}
+
+pub fn unwind_value() -> i32 {
+    unsafe { rustdoc_musl_unwind_value() }
+}

test/rustdoc_musl_unwind.rs

@@ -0,0 +1,55 @@
+"""Regression tests for musl rustdoc native linking."""
+
+load("@bazel_skylib//lib:unittest.bzl", "analysistest", "asserts")
+
+def _get_action_by_mnemonic(env, tut, mnemonic):
+    actions = [action for action in tut.actions if action.mnemonic == mnemonic]
+    asserts.equals(
+        env,
+        1,
+        len(actions),
+        "Expected exactly one {} action, got {}".format(mnemonic, [action.mnemonic for action in tut.actions]),
+    )
+    return actions[0]
+
+def _assert_argv_contains(env, action, expected):
+    asserts.true(
+        env,
+        expected in action.argv,
+        "Expected argv to contain {}, got {}".format(expected, action.argv),
+    )
+
+def _assert_argv_contains_substrings(env, action, substrings, description):
+    for arg in action.argv:
+        if all([substring in arg for substring in substrings]):
+            return
+
+    asserts.true(
+        env,
+        False,
+        "Expected argv to contain {}, got {}".format(description, action.argv),
+    )
+
+def _rustdoc_musl_unwind_link_flags_test_impl(ctx):
+    env = analysistest.begin(ctx)
+    tut = analysistest.target_under_test(env)
+    action = _get_action_by_mnemonic(env, tut, "RustdocTest")
+
+    _assert_argv_contains(env, action, "--test")
+    _assert_argv_contains(env, action, "-Clink-arg=-lrustdoc_musl_unwind_cc")
+    _assert_argv_contains_substrings(
+        env,
+        action,
+        ["-Clink-arg=-l", "unwind"],
+        "a rustdoc-compatible libunwind link argument",
+    )
+
+    return analysistest.end(env)
+
+rustdoc_musl_unwind_link_flags_test = analysistest.make(
+    _rustdoc_musl_unwind_link_flags_test_impl,
+    config_settings = {
+        "//command_line_option:extra_execution_platforms": str(Label("@rules_rs//rs/platforms:x86_64-unknown-linux-musl")),
+        "//command_line_option:platforms": str(Label("@rules_rs//rs/platforms:x86_64-unknown-linux-musl")),
+    },
+)