Remove --incompatible_remove_transitive_libs_from_dep_info (#1124)

Closes #1051

Author: scentini

docs/flatten.md

@@ -1386,7 +1386,7 @@ A provider containing general Crate information.
 
 <pre>
 DepInfo(<a href="#DepInfo-dep_env">dep_env</a>, <a href="#DepInfo-direct_crates">direct_crates</a>, <a href="#DepInfo-transitive_build_infos">transitive_build_infos</a>, <a href="#DepInfo-transitive_crate_outputs">transitive_crate_outputs</a>, <a href="#DepInfo-transitive_crates">transitive_crates</a>,
-        <a href="#DepInfo-transitive_libs">transitive_libs</a>, <a href="#DepInfo-transitive_noncrates">transitive_noncrates</a>)
+        <a href="#DepInfo-transitive_noncrates">transitive_noncrates</a>)
 </pre>
 
 A provider containing information about a Crate's dependencies.
@@ -1401,7 +1401,6 @@ A provider containing information about a Crate's dependencies.
 | <a id="DepInfo-transitive_build_infos"></a>transitive_build_infos |  depset[BuildInfo]    |
 | <a id="DepInfo-transitive_crate_outputs"></a>transitive_crate_outputs |  depset[File]: All transitive crate outputs.    |
 | <a id="DepInfo-transitive_crates"></a>transitive_crates |  depset[CrateInfo]    |
-| <a id="DepInfo-transitive_libs"></a>transitive_libs |  List[File]: (Deprecated, see https://github.com/bazelbuild/rules_rust/issues/1051) All transitive dependencies, not filtered by type.    |
 | <a id="DepInfo-transitive_noncrates"></a>transitive_noncrates |  depset[LinkerInput]: All transitive dependencies that aren't crates.    |
 
 

docs/providers.md

@@ -43,7 +43,7 @@ A provider containing general Crate information.
 
 <pre>
 DepInfo(<a href="#DepInfo-dep_env">dep_env</a>, <a href="#DepInfo-direct_crates">direct_crates</a>, <a href="#DepInfo-transitive_build_infos">transitive_build_infos</a>, <a href="#DepInfo-transitive_crate_outputs">transitive_crate_outputs</a>, <a href="#DepInfo-transitive_crates">transitive_crates</a>,
-        <a href="#DepInfo-transitive_libs">transitive_libs</a>, <a href="#DepInfo-transitive_noncrates">transitive_noncrates</a>)
+        <a href="#DepInfo-transitive_noncrates">transitive_noncrates</a>)
 </pre>
 
 A provider containing information about a Crate's dependencies.
@@ -58,7 +58,6 @@ A provider containing information about a Crate's dependencies.
 | <a id="DepInfo-transitive_build_infos"></a>transitive_build_infos |  depset[BuildInfo]    |
 | <a id="DepInfo-transitive_crate_outputs"></a>transitive_crate_outputs |  depset[File]: All transitive crate outputs.    |
 | <a id="DepInfo-transitive_crates"></a>transitive_crates |  depset[CrateInfo]    |
-| <a id="DepInfo-transitive_libs"></a>transitive_libs |  List[File]: (Deprecated, see https://github.com/bazelbuild/rules_rust/issues/1051) All transitive dependencies, not filtered by type.    |
 | <a id="DepInfo-transitive_noncrates"></a>transitive_noncrates |  depset[LinkerInput]: All transitive dependencies that aren't crates.    |
 
 

rust/private/clippy.bzl

@@ -70,7 +70,6 @@ def _clippy_aspect_impl(target, ctx):
         aliases = crate_info.aliases,
         # Clippy doesn't need to invoke transitive linking, therefore doesn't need linkstamps.
         are_linkstamps_supported = False,
-        remove_transitive_libs_from_dep_info = toolchain._incompatible_remove_transitive_libs_from_dep_info,
     )
 
     compile_inputs, out_dir, build_env_files, build_flags_files, linkstamp_outs = collect_inputs(

rust/private/providers.bzl

@@ -48,8 +48,6 @@ DepInfo = provider(
         "transitive_build_infos": "depset[BuildInfo]",
         "transitive_crate_outputs": "depset[File]: All transitive crate outputs.",
         "transitive_crates": "depset[CrateInfo]",
-        "transitive_libs": "List[File]: (Deprecated, see https://github.com/bazelbuild/rules_rust/issues/1051) " +
-                           "All transitive dependencies, not filtered by type.",
         "transitive_noncrates": "depset[LinkerInput]: All transitive dependencies that aren't crates.",
     },
 )

rust/private/rustc.bzl

@@ -122,8 +122,7 @@ def collect_deps(
         deps,
         proc_macro_deps,
         aliases,
-        are_linkstamps_supported = False,
-        remove_transitive_libs_from_dep_info = False):
+        are_linkstamps_supported = False):
     """Walks through dependencies and collects the transitive dependencies.
 
     Args:
@@ -132,8 +131,6 @@ def collect_deps(
         proc_macro_deps (list): The proc_macro deps from ctx.attr.proc_macro_deps.
         aliases (dict): A dict mapping aliased targets to their actual Crate information.
         are_linkstamps_supported (bool): Whether the current rule and the toolchain support building linkstamps..
-        remove_transitive_libs_from_dep_info (bool): Whether
-            --incompatible_remove_transitive_libs_from_dep_info has been flipped.
 
     Returns:
         tuple: Returns a tuple of:
@@ -180,16 +177,10 @@ def collect_deps(
                 ),
             )
             transitive_noncrates.append(dep_info.transitive_noncrates)
-            if not remove_transitive_libs_from_dep_info:
-                transitive_noncrate_libs.append(dep_info.transitive_libs)
             transitive_build_infos.append(dep_info.transitive_build_infos)
         elif cc_info:
             # This dependency is a cc_library
             transitive_noncrates.append(cc_info.linking_context.linker_inputs)
-            if not remove_transitive_libs_from_dep_info:
-                transitive_noncrate_libs.append(depset(
-                    _collect_libs_from_linker_inputs(cc_info.linking_context.linker_inputs.to_list()),
-                ))
         elif dep_build_info:
             if build_info:
                 fail("Several deps are providing build information, " +
@@ -202,11 +193,6 @@ def collect_deps(
 
     transitive_crates_depset = depset(transitive = transitive_crates)
     transitive_libs = depset([])
-    if not remove_transitive_libs_from_dep_info:
-        transitive_libs = depset(
-            [c.output for c in transitive_crates_depset.to_list()],
-            transitive = transitive_noncrate_libs,
-        )
 
     return (
         rust_common.dep_info(
@@ -217,7 +203,6 @@ def collect_deps(
                 order = "topological",  # dylib link flag ordering matters.
             ),
             transitive_crate_outputs = depset(transitive = transitive_crate_outputs),
-            transitive_libs = transitive_libs,
             transitive_build_infos = depset(transitive = transitive_build_infos),
             dep_env = build_info.dep_env if build_info else None,
         ),
@@ -732,8 +717,6 @@ def rustc_compile_action(
     """
     cc_toolchain, feature_configuration = find_cc_toolchain(ctx)
 
-    remove_transitive_libs_from_dep_info = toolchain._incompatible_remove_transitive_libs_from_dep_info
-
     dep_info, build_info, linkstamps = collect_deps(
         label = ctx.label,
         deps = crate_info.deps,
@@ -743,7 +726,6 @@ def rustc_compile_action(
             feature_configuration = feature_configuration,
             has_grep_includes = hasattr(ctx.attr, "_grep_includes"),
         ),
-        remove_transitive_libs_from_dep_info = remove_transitive_libs_from_dep_info,
     )
 
     # Determine if the build is currently running with --stamp

rust/private/rustdoc.bzl

@@ -76,7 +76,6 @@ def rustdoc_compile_action(
         deps = crate_info.deps,
         proc_macro_deps = crate_info.proc_macro_deps,
         aliases = crate_info.aliases,
-        remove_transitive_libs_from_dep_info = toolchain._incompatible_remove_transitive_libs_from_dep_info,
     )
 
     compile_inputs, out_dir, build_env_files, build_flags_files, linkstamp_outs = collect_inputs(

rust/settings/BUILD.bazel

@@ -1,15 +1,8 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "string_flag")
-load(":incompatible.bzl", "incompatible_flag")
 
 package(default_visibility = ["//visibility:public"])
 
-incompatible_flag(
-    name = "incompatible_remove_transitive_libs_from_dep_info",
-    build_setting_default = True,
-    issue = "https://github.com/bazelbuild/rules_rust/issues/1051",
-)
-
 # A flag controlling whether to rename first-party crates such that their names
 # encode the Bazel package and target name, instead of just the target name.
 #

rust/toolchain.bzl

@@ -3,7 +3,6 @@
 load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo")
 load("//rust/private:common.bzl", "rust_common")
 load("//rust/private:utils.bzl", "dedent", "find_cc_toolchain", "make_static_lib_symlink")
-load("//rust/settings:incompatible.bzl", "IncompatibleFlagInfo")
 
 def _rust_stdlib_filegroup_impl(ctx):
     rust_std = ctx.files.srcs
@@ -232,8 +231,6 @@ def _rust_toolchain_impl(ctx):
     if ctx.attr.target_triple and ctx.file.target_json:
         fail("Do not specify both target_triple and target_json, either use a builtin triple or provide a custom specification file.")
 
-    remove_transitive_libs_from_dep_info = ctx.attr._incompatible_remove_transitive_libs_from_dep_info[IncompatibleFlagInfo]
-
     rename_first_party_crates = ctx.attr._rename_first_party_crates[BuildSettingInfo].value
     third_party_dir = ctx.attr._third_party_dir[BuildSettingInfo].value
 
@@ -308,7 +305,6 @@ def _rust_toolchain_impl(ctx):
         compilation_mode_opts = compilation_mode_opts,
         crosstool_files = ctx.files._crosstool,
         libstd_and_allocator_ccinfo = _make_libstd_and_allocator_ccinfo(ctx, rust_std, ctx.attr.allocator_library),
-        _incompatible_remove_transitive_libs_from_dep_info = remove_transitive_libs_from_dep_info.enabled,
         _rename_first_party_crates = rename_first_party_crates,
         _third_party_dir = third_party_dir,
     )
@@ -429,9 +425,6 @@ rust_toolchain = rule(
         "_crosstool": attr.label(
             default = Label("@bazel_tools//tools/cpp:current_cc_toolchain"),
         ),
-        "_incompatible_remove_transitive_libs_from_dep_info": attr.label(
-            default = "@rules_rust//rust/settings:incompatible_remove_transitive_libs_from_dep_info",
-        ),
         "_rename_first_party_crates": attr.label(
             default = "@rules_rust//rust/settings:rename_first_party_crates",
         ),