Use relative symlinks for clippy and rustfmt repos

Author: dzbarsky

rs/private/BUILD.bazel

@@ -136,6 +136,7 @@ bzl_library(
     srcs = ["clippy_repository.bzl"],
     visibility = ["//rs:__subpackages__"],
     deps = [
+        ":symlink_utils",
         "@rules_rust//rust/platform:bzl_lib",
         "@rules_rust//rust/private:bzl_lib",
     ],
@@ -146,6 +147,7 @@ bzl_library(
     srcs = ["rustfmt_repository.bzl"],
     visibility = ["//rs:__subpackages__"],
     deps = [
+        ":symlink_utils",
         "//rs/private:rust_repository_utils",
         "@rules_rust//rust/platform:bzl_lib",
         "@rules_rust//rust/private:bzl_lib",

rs/private/clippy_repository.bzl

@@ -1,19 +1,17 @@
-load("@bazel_features//:features.bzl", "bazel_features")
 load("@rules_rust//rust/platform:triple.bzl", "triple")
 load("@rules_rust//rust/private:repository_utils.bzl", "BUILD_for_clippy")
-load(":rust_repository_utils.bzl", "download_and_extract", "RUST_REPOSITORY_COMMON_ATTR")
+load(":rust_repository_utils.bzl", "RUST_REPOSITORY_COMMON_ATTR", "download_and_extract")
+load(":symlink_utils.bzl", "relative_symlink")
 
 def _clippy_repository_impl(rctx):
     exec_triple = triple(rctx.attr.triple)
     download_and_extract(rctx, "clippy", "clippy-preview", exec_triple)
     rctx.file("BUILD.bazel", BUILD_for_clippy(exec_triple))
 
     rustc_repo_root = rctx.path(rctx.attr.rustc_repo_build_file).dirname
-    rctx.symlink(rustc_repo_root.get_child("lib"), "lib")
+    relative_symlink(rctx, rustc_repo_root.get_child("lib"), "lib")
 
-    return rctx.repo_metadata(
-        reproducible = bazel_features.external_deps.repo_rules_relativize_symlinks,
-    )
+    return rctx.repo_metadata(reproducible = True)
 
 clippy_repository = repository_rule(
     implementation = _clippy_repository_impl,

rs/private/rustfmt_repository.bzl

@@ -1,7 +1,7 @@
-load("@bazel_features//:features.bzl", "bazel_features")
 load("@rules_rust//rust/platform:triple.bzl", "triple")
 load("@rules_rust//rust/private:repository_utils.bzl", "BUILD_for_rustfmt")
-load(":rust_repository_utils.bzl", "download_and_extract", "RUST_REPOSITORY_COMMON_ATTR")
+load(":rust_repository_utils.bzl", "RUST_REPOSITORY_COMMON_ATTR", "download_and_extract")
+load(":symlink_utils.bzl", "relative_symlink")
 
 _RUSTFMT_LIB_FILEGROUP_TEMPLATE = """
 filegroup(
@@ -23,11 +23,9 @@ def _rustfmt_repository_impl(rctx):
     )
 
     rustc_repo_root = rctx.path(rctx.attr.rustc_repo_build_file).dirname
-    rctx.symlink(rustc_repo_root.get_child("lib"), "lib")
+    relative_symlink(rctx, rustc_repo_root.get_child("lib"), "lib")
 
-    return rctx.repo_metadata(
-        reproducible = bazel_features.external_deps.repo_rules_relativize_symlinks,
-    )
+    return rctx.repo_metadata(reproducible = True)
 
 rustfmt_repository = repository_rule(
     implementation = _rustfmt_repository_impl,