Use depset instead of mutable lists

proto/proto.bzl

@@ -222,9 +222,9 @@ def _rust_proto_compile(protos, descriptor_sets, imports, crate_name, ctx, is_gr
             name = crate_name,
             type = "rlib",
             root = lib_rs,
-            srcs = srcs,
-            deps = compile_deps,
-            proc_macro_deps = [],
+            srcs = depset(srcs),
+            deps = depset(compile_deps),
+            proc_macro_deps = depset([]),
             aliases = {},
             output = rust_lib,
             edition = proto_toolchain.edition,

rust/private/providers.bzl

@@ -18,15 +18,15 @@ CrateInfo = provider(
     doc = "A provider containing general Crate information.",
     fields = {
         "aliases": "Dict[Label, String]: Renamed and aliased crates",
-        "deps": "List[Provider]: This crate's (rust or cc) dependencies' providers.",
+        "deps": "depset[Provider]: This crate's (rust or cc) dependencies' providers.",
         "edition": "str: The edition of this crate.",
         "is_test": "bool: If the crate is being compiled in a test context",
         "name": "str: The name of this crate.",
         "output": "File: The output File that will be produced, depends on crate type.",
-        "proc_macro_deps": "List[CrateInfo]: This crate's rust proc_macro dependencies' providers.",
+        "proc_macro_deps": "depset[CrateInfo]: This crate's rust proc_macro dependencies' providers.",
         "root": "File: The source File entrypoint to this crate, eg. lib.rs",
         "rustc_env": "Dict[String, String]: Additional `\"key\": \"value\"` environment variables to set for rustc.",
-        "srcs": "List[File]: All source Files that are part of the crate.",
+        "srcs": "depset[File]: All source Files that are part of the crate.",
         "type": "str: The type of this crate. eg. lib or bin",
     },
 )

rust/private/rust.bzl

@@ -226,9 +226,9 @@ def _rust_library_common(ctx, crate_type):
             name = crate_name,
             type = crate_type,
             root = crate_root,
-            srcs = ctx.files.srcs,
-            deps = ctx.attr.deps,
-            proc_macro_deps = ctx.attr.proc_macro_deps,
+            srcs = depset(ctx.files.srcs),
+            deps = depset(ctx.attr.deps),
+            proc_macro_deps = depset(ctx.attr.proc_macro_deps),
             aliases = ctx.attr.aliases,
             output = rust_lib,
             edition = get_edition(ctx.attr, toolchain),
@@ -260,9 +260,9 @@ def _rust_binary_impl(ctx):
             name = crate_name,
             type = "bin",
             root = crate_root_src(ctx.attr, ctx.files.srcs, crate_type = "bin"),
-            srcs = ctx.files.srcs,
-            deps = ctx.attr.deps,
-            proc_macro_deps = ctx.attr.proc_macro_deps,
+            srcs = depset(ctx.files.srcs),
+            deps = depset(ctx.attr.deps),
+            proc_macro_deps = depset(ctx.attr.proc_macro_deps),
             aliases = ctx.attr.aliases,
             output = output,
             edition = get_edition(ctx.attr, toolchain),
@@ -370,13 +370,13 @@ def _rust_test_common(ctx, toolchain, output):
         # Target is building the crate in `test` config
         # Build the test binary using the dependency's srcs.
         crate = ctx.attr.crate[rust_common.crate_info]
-        target = rust_common.crate_info(
+        crate_info = rust_common.crate_info(
             name = crate_name,
             type = crate_type,
             root = crate.root,
-            srcs = crate.srcs + ctx.files.srcs,
-            deps = crate.deps + ctx.attr.deps,
-            proc_macro_deps = crate.proc_macro_deps + ctx.attr.proc_macro_deps,
+            srcs = depset(ctx.files.srcs, transitive = [crate.srcs]),
+            deps = depset(ctx.attr.deps, transitive = [crate.deps]),
+            proc_macro_deps = depset( ctx.attr.proc_macro_deps, transitive = [crate.proc_macro_deps]),
             aliases = ctx.attr.aliases,
             output = output,
             edition = crate.edition,
@@ -385,13 +385,13 @@ def _rust_test_common(ctx, toolchain, output):
         )
     else:
         # Target is a standalone crate. Build the test binary as its own crate.
-        target = rust_common.crate_info(
+        crate_info = rust_common.crate_info(
             name = crate_name,
             type = crate_type,
             root = crate_root_src(ctx.attr, ctx.files.srcs, "lib"),
-            srcs = ctx.files.srcs,
-            deps = ctx.attr.deps,
-            proc_macro_deps = ctx.attr.proc_macro_deps,
+            srcs = depset(ctx.files.srcs),
+            deps = depset(ctx.attr.deps),
+            proc_macro_deps = depset(ctx.attr.proc_macro_deps),
             aliases = ctx.attr.aliases,
             output = output,
             edition = get_edition(ctx.attr, toolchain),
@@ -403,7 +403,7 @@ def _rust_test_common(ctx, toolchain, output):
         ctx = ctx,
         toolchain = toolchain,
         crate_type = crate_type,
-        crate_info = target,
+        crate_info = crate_info,
         rust_flags = ["--test"],
     )
 

rust/private/rustc.bzl

@@ -114,7 +114,7 @@ def collect_deps(label, deps, proc_macro_deps, aliases, toolchain):
         tuple: Returns a tuple (DepInfo, BuildInfo) of providers.
     """
 
-    for dep in deps:
+    for dep in deps.to_list():
         if rust_common.crate_info in dep:
             if dep[rust_common.crate_info].type == "proc-macro":
                 fail(
@@ -123,7 +123,7 @@ def collect_deps(label, deps, proc_macro_deps, aliases, toolchain):
                         dep.label,
                     ),
                 )
-    for dep in proc_macro_deps:
+    for dep in proc_macro_deps.to_list():
         type = dep[rust_common.crate_info].type
         if type != "proc-macro":
             fail(
@@ -142,7 +142,7 @@ def collect_deps(label, deps, proc_macro_deps, aliases, toolchain):
     build_info = None
 
     aliases = {k.label: v for k, v in aliases.items()}
-    for dep in deps + proc_macro_deps:
+    for dep in depset(transitive = [deps, proc_macro_deps]).to_list():
         if rust_common.crate_info in dep:
             # This dependency is a rust_library
             direct_dep = dep[rust_common.crate_info]
@@ -301,7 +301,6 @@ def collect_inputs(
     linker_depset = cc_toolchain.all_files
 
     compile_inputs = depset(
-        crate_info.srcs +
         getattr(files, "data", []) +
         getattr(files, "compile_data", []) +
         dep_info.transitive_libs +
@@ -313,6 +312,7 @@ def collect_inputs(
             toolchain.rustc_lib.files,
             toolchain.rust_lib.files,
             linker_depset,
+            crate_info.srcs,
         ],
     )
     build_env_files = getattr(files, "rustc_env_files", [])
@@ -584,7 +584,7 @@ def rustc_compile_action(
             crate_info.type,
             ctx.label.name,
             formatted_version,
-            len(crate_info.srcs),
+            len(crate_info.srcs.to_list()),
         ),
     )
 

rust/private/rustdoc.bzl

@@ -71,10 +71,10 @@ def _rust_doc_impl(ctx):
     toolchain = find_toolchain(ctx)
 
     rustdoc_inputs = depset(
-        crate.srcs +
         [c.output for c in dep_info.transitive_crates.to_list()] +
         [toolchain.rust_doc],
         transitive = [
+            crate.srcs,
             toolchain.rustc_lib.files,
             toolchain.rust_lib.files,
         ],
@@ -105,7 +105,7 @@ def _rust_doc_impl(ctx):
         outputs = [output_dir],
         arguments = [args],
         mnemonic = "Rustdoc",
-        progress_message = "Generating rustdoc for {} ({} files)".format(crate.name, len(crate.srcs)),
+        progress_message = "Generating rustdoc for {} ({} files)".format(crate.name, len(crate.srcs.to_list())),
     )
 
     # This rule does nothing without a single-file output, though the directory should've sufficed.

rust/private/rustdoc_test.bzl

@@ -44,13 +44,13 @@ 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.srcs +
         [crate.output] +
         dep_info.transitive_libs +
         [toolchain.rust_doc] +
         [toolchain.rustc] +
         toolchain.crosstool_files,
         transitive = [
+            crate.srcs,
             toolchain.rustc_lib.files,
             toolchain.rust_lib.files,
         ],