From 5ad11578827551ec7793203cea6c5e42311d1e21 Mon Sep 17 00:00:00 2001
From: David Freese <freese@verily.com>
Date: Wed, 31 Mar 2021 11:11:53 -0700
Subject: [PATCH] Change transitive_libs in DepInfo to a depset

It appears to already be a depset, just happens to be flattened.  It's
not a part of the external API, so, in theory, this should have an
effect.
---
 rust/private/rustc.bzl        | 4 ++--
 rust/private/rustdoc_test.bzl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rust/private/rustc.bzl b/rust/private/rustc.bzl
index 88287bd642..b73ba37209 100644
--- a/rust/private/rustc.bzl
+++ b/rust/private/rustc.bzl
@@ -165,7 +165,7 @@ def collect_deps(label, deps, proc_macro_deps, aliases, toolchain):
                 transitive = transitive_noncrates,
                 order = "topological",  # dylib link flag ordering matters.
             ),
-            transitive_libs = transitive_libs.to_list(),
+            transitive_libs = transitive_libs,
             transitive_build_infos = depset(transitive = transitive_build_infos),
             dep_env = build_info.dep_env if build_info else None,
         ),
@@ -283,7 +283,6 @@ def collect_inputs(
     compile_inputs = depset(
         getattr(files, "data", []) +
         getattr(files, "compile_data", []) +
-        dep_info.transitive_libs +
         [toolchain.rustc] +
         toolchain.crosstool_files +
         ([build_info.rustc_env, build_info.flags] if build_info else []) +
@@ -293,6 +292,7 @@ def collect_inputs(
             toolchain.rust_lib.files,
             linker_depset,
             crate_info.srcs,
+            dep_info.transitive_libs,
         ],
     )
     build_env_files = getattr(files, "rustc_env_files", [])
diff --git a/rust/private/rustdoc_test.bzl b/rust/private/rustdoc_test.bzl
index 172602af15..abdfed6e48 100644
--- a/rust/private/rustdoc_test.bzl
+++ b/rust/private/rustdoc_test.bzl
@@ -45,12 +45,12 @@ def _rust_doc_test_impl(ctx):
     # The test script compiles the crate and runs it, so it needs both compile and runtime inputs.
     compile_inputs = depset(
         [crate.output] +
-        dep_info.transitive_libs +
         [toolchain.rust_doc] +
         [toolchain.rustc] +
         toolchain.crosstool_files,
         transitive = [
             crate.srcs,
+            dep_info.transitive_libs,
             toolchain.rustc_lib.files,
             toolchain.rust_lib.files,
         ],