Better fix for rust_doc_test

Author: UebelAndre

rust/private/rustdoc.bzl

@@ -48,7 +48,8 @@ def rustdoc_compile_action(
         toolchain,
         crate_info,
         output = None,
-        rustdoc_flags = []):
+        rustdoc_flags = [],
+        is_test = False):
     """Create a struct of information needed for a `rustdoc` compile action based on crate passed to the rustdoc rule.
 
     Args:
@@ -57,6 +58,7 @@ def rustdoc_compile_action(
         crate_info (CrateInfo): The provider of the crate passed to a rustdoc rule.
         output (File, optional): An optional output a `rustdoc` action is intended to produce.
         rustdoc_flags (list, optional): A list of `rustdoc` specific flags.
+        is_test (bool, optional): If True, the action will be configured for `rust_doc_test` targets
 
     Returns:
         struct: A struct of some `ctx.actions.run` arguments.
@@ -102,7 +104,7 @@ def rustdoc_compile_action(
         attr = ctx.attr,
         file = ctx.file,
         toolchain = toolchain,
-        tool_path = toolchain.rust_doc.path,
+        tool_path = toolchain.rust_doc.short_path if is_test else toolchain.rust_doc.path,
         cc_toolchain = cc_toolchain,
         feature_configuration = feature_configuration,
         crate_info = rustdoc_crate_info,

rust/private/rustdoc_test.bzl

@@ -56,11 +56,6 @@ def _construct_writer_arguments(ctx, test_runner, action, crate_info, rust_toolc
     for var in action.env.keys():
         writer_args.add("--action_env={}".format(var))
 
-    # Ensure the rustdoc binary is always accessed via a relative path
-    writer_args.add("--strip_substring={}/".format(
-        rust_toolchain.rust_doc.root.path,
-    ))
-
     # Since the test runner will be running from a runfiles directory, the
     # paths originally generated for the build action will not map to any
     # files. To ensure rustdoc can find the appropriate dependencies, the
@@ -121,6 +116,7 @@ def _rust_doc_test_impl(ctx):
         toolchain = find_toolchain(ctx),
         crate_info = crate_info,
         rustdoc_flags = rustdoc_flags,
+        is_test = True,
     )
 
     tools = action.tools + [ctx.executable._process_wrapper]