Rename non_rust functions to generalize for both rust + non_rust

Summary: In preparation for the next diff in this stack, I've split out the renaming to a pure refactor, for ease of review.

Reviewed By: zertosh

Differential Revision: D50804300

fbshipit-source-id: 243335f03e5ca2eda3b3020a4075f573d8b48a42

Author: capickett

prelude/rust/build.bzl

@@ -67,8 +67,8 @@ load(
     "attr_simple_crate_for_filenames",
     "get_available_proc_macros",
     "inherited_external_debug_info",
-    "inherited_non_rust_link_info",
-    "inherited_non_rust_shared_libs",
+    "inherited_merged_link_infos",
+    "inherited_shared_libs",
     "normalize_crate",
     "resolve_rust_deps",
     "style_info",
@@ -230,7 +230,7 @@ def generate_rustdoc_test(
     if link_style == LinkStyle("shared"):
         shlib_info = merge_shared_libraries(
             ctx.actions,
-            deps = inherited_non_rust_shared_libs(ctx, include_doc_deps = True),
+            deps = inherited_shared_libs(ctx, include_doc_deps = True),
         )
         for soname, shared_lib in traverse_shared_library_info(shlib_info).items():
             shared_libs[soname] = shared_lib.lib
@@ -258,7 +258,7 @@ def generate_rustdoc_test(
             LinkArgs(flags = extra_link_args),
             get_link_args_for_strategy(
                 ctx,
-                inherited_non_rust_link_info(ctx, include_doc_deps = True),
+                inherited_merged_link_infos(ctx, include_doc_deps = True),
                 # TODO(cjhopman): It's unclear how rust is using link_style. I'm not sure if it's intended to be a LibOutputStyle or a LinkStrategy.
                 to_link_strategy(link_style),
             ),
@@ -435,14 +435,14 @@ def rust_compile(
         # of that style.
 
         if rust_cxx_link_group_info:
-            inherited_non_rust_link_args = LinkArgs(
+            inherited_link_args = LinkArgs(
                 infos = rust_cxx_link_group_info.filtered_links + [rust_cxx_link_group_info.symbol_files_info],
             )
 
         else:
-            inherited_non_rust_link_args = get_link_args_for_strategy(
+            inherited_link_args = get_link_args_for_strategy(
                 ctx,
-                inherited_non_rust_link_info(
+                inherited_merged_link_infos(
                     ctx,
                     include_doc_deps = False,
                 ),
@@ -455,7 +455,7 @@ def rust_compile(
             compile_ctx.cxx_toolchain_info,
             [
                 LinkArgs(flags = extra_link_args),
-                inherited_non_rust_link_args,
+                inherited_link_args,
             ],
             "{}-{}".format(subdir, tempfile),
             output_short_path = emit_output.short_path,

prelude/rust/link_info.bzl

@@ -121,12 +121,12 @@ RustLinkInfo = provider(
         "crate": CrateName,
         # styles - information about each LinkStyle as RustLinkStyleInfo
         "styles": dict[LinkStyle, RustLinkStyleInfo],
-        # Propagate non-rust native linkable dependencies through rust libraries.
-        "non_rust_exported_link_deps": typing.Any,
-        # Propagate non-rust native linkable info through rust libraries.
-        "non_rust_link_info": typing.Any,
-        # Propagate non-rust shared libraries through rust libraries.
-        "non_rust_shared_libs": typing.Any,
+        # Propagate native linkable dependencies through rust libraries.
+        "exported_link_deps": typing.Any,
+        # Propagate native linkable info through rust libraries.
+        "merged_link_info": typing.Any,
+        # Propagate shared libraries through rust libraries.
+        "shared_libs": typing.Any,
     },
 )
 
@@ -253,7 +253,7 @@ def resolve_rust_deps(
 def get_available_proc_macros(ctx: AnalysisContext) -> dict[TargetLabel, Dependency]:
     return {x.label.raw_target(): x for x in ctx.plugins[RustProcMacroPlugin]}
 
-def _non_rust_linkable_graph(
+def _create_linkable_graph(
         ctx: AnalysisContext,
         deps: list[Dependency]) -> LinkableGraph:
     linkable_graph = create_linkable_graph(
@@ -323,19 +323,21 @@ def _rust_link_infos(
 def normalize_crate(label: str) -> str:
     return label.replace("-", "_")
 
-def inherited_non_rust_exported_link_deps(ctx: AnalysisContext) -> list[Dependency]:
+# TODO(pickett): Currently this assumes the library target is being built as a
+# staticlib or cdylib.
+def inherited_exported_link_deps(ctx: AnalysisContext) -> list[Dependency]:
     deps = {}
     for dep in _non_rust_link_deps(ctx):
         deps[dep.label] = dep
     for info in _rust_link_infos(ctx):
-        for dep in info.non_rust_exported_link_deps:
+        for dep in info.exported_link_deps:
             deps[dep.label] = dep
     return deps.values()
 
-def inherited_non_rust_link_group_info(
+def inherited_rust_cxx_link_group_info(
         ctx: AnalysisContext,
         link_style: [LinkStyle, None] = None) -> RustCxxLinkGroupInfo:
-    link_deps = inherited_non_rust_exported_link_deps(ctx)
+    link_deps = inherited_exported_link_deps(ctx)
 
     # Assume a rust executable wants to use link groups if a link group map
     # is present
@@ -346,7 +348,7 @@ def inherited_non_rust_link_group_info(
     link_group_preferred_linkage = get_link_group_preferred_linkage(link_groups.values())
 
     auto_link_group_specs = get_auto_link_group_specs(ctx, link_group_info)
-    linkable_graph = _non_rust_linkable_graph(
+    linkable_graph = _create_linkable_graph(
         ctx,
         link_deps,
     )
@@ -413,20 +415,24 @@ def inherited_non_rust_link_group_info(
         link_group_preferred_linkage = link_group_preferred_linkage,
     )
 
-def inherited_non_rust_link_info(
+# TODO(pickett): Currently this assumes the library target is being built as a
+# staticlib or cdylib.
+def inherited_merged_link_infos(
         ctx: AnalysisContext,
         include_doc_deps: bool = False) -> list[MergedLinkInfo]:
     infos = []
     infos.extend(_non_rust_link_infos(ctx, include_doc_deps))
-    infos.extend([d.non_rust_link_info for d in _rust_link_infos(ctx, include_doc_deps) if d.non_rust_link_info])
+    infos.extend([d.merged_link_info for d in _rust_link_infos(ctx, include_doc_deps) if d.merged_link_info])
     return infos
 
-def inherited_non_rust_shared_libs(
+# TODO(pickett): Currently this assumes the library target is being built as a
+# staticlib or cdylib.
+def inherited_shared_libs(
         ctx: AnalysisContext,
         include_doc_deps: bool = False) -> list[SharedLibraryInfo]:
     infos = []
     infos.extend(_non_rust_shared_lib_infos(ctx, include_doc_deps))
-    infos.extend([d.non_rust_shared_libs for d in _rust_link_infos(ctx, include_doc_deps)])
+    infos.extend([d.shared_libs for d in _rust_link_infos(ctx, include_doc_deps)])
     return infos
 
 def inherited_external_debug_info(
@@ -437,16 +443,16 @@ def inherited_external_debug_info(
     non_rust_dep_link_style = dep_link_style
 
     inherited_debug_infos = []
-    inherited_non_rust_link_infos = []
+    inherited_link_infos = []
 
     for d in resolve_deps(ctx):
         if RustLinkInfo in d.dep:
             inherited_debug_infos.append(d.dep[RustLinkInfo].styles[rust_dep_link_style].external_debug_info)
-            inherited_non_rust_link_infos.append(d.dep[RustLinkInfo].non_rust_link_info)
+            inherited_link_infos.append(d.dep[RustLinkInfo].merged_link_info)
         elif MergedLinkInfo in d.dep:
-            inherited_non_rust_link_infos.append(d.dep[MergedLinkInfo])
+            inherited_link_infos.append(d.dep[MergedLinkInfo])
 
-    link_args = get_link_args_for_strategy(ctx, inherited_non_rust_link_infos, to_link_strategy(non_rust_dep_link_style))
+    link_args = get_link_args_for_strategy(ctx, inherited_link_infos, to_link_strategy(non_rust_dep_link_style))
     inherited_debug_infos.append(unpack_external_debug_info(ctx.actions, link_args))
 
     return make_artifact_tset(

prelude/rust/rust_binary.bzl

@@ -64,8 +64,8 @@ load(
     "DEFAULT_STATIC_LINK_STYLE",
     "attr_simple_crate_for_filenames",
     "enable_link_groups",
-    "inherited_non_rust_link_group_info",
-    "inherited_non_rust_shared_libs",
+    "inherited_rust_cxx_link_group_info",
+    "inherited_shared_libs",
 )
 load(":resources.bzl", "rust_attr_resources")
 
@@ -131,7 +131,7 @@ def _rust_binary_common(
         filtered_targets = []
 
         if enable_link_groups(ctx, link_style, specified_link_style, is_binary = True):
-            rust_cxx_link_group_info = inherited_non_rust_link_group_info(
+            rust_cxx_link_group_info = inherited_rust_cxx_link_group_info(
                 ctx,
                 link_style = link_style,
             )
@@ -147,7 +147,7 @@ def _rust_binary_common(
         if link_style == LinkStyle("shared") or rust_cxx_link_group_info != None:
             shlib_info = merge_shared_libraries(
                 ctx.actions,
-                deps = inherited_non_rust_shared_libs(ctx),
+                deps = inherited_shared_libs(ctx),
             )
 
             link_group_ctx = LinkGroupContext(

prelude/rust/rust_library.bzl

@@ -97,10 +97,10 @@ load(
     "RustLinkStyleInfo",
     "RustProcMacroMarker",  # @unused Used as a type
     "attr_crate",
+    "inherited_exported_link_deps",
     "inherited_external_debug_info",
-    "inherited_non_rust_exported_link_deps",
-    "inherited_non_rust_link_info",
-    "inherited_non_rust_shared_libs",
+    "inherited_merged_link_infos",
+    "inherited_shared_libs",
     "resolve_deps",
     "resolve_rust_deps",
     "style_info",
@@ -142,11 +142,11 @@ def prebuilt_rust_library_impl(ctx: AnalysisContext) -> list[Provider]:
         RustLinkInfo(
             crate = crate,
             styles = styles,
-            non_rust_exported_link_deps = inherited_non_rust_exported_link_deps(ctx),
-            non_rust_link_info = create_merged_link_info_for_propagation(ctx, inherited_non_rust_link_info(ctx)),
-            non_rust_shared_libs = merge_shared_libraries(
+            exported_link_deps = inherited_exported_link_deps(ctx),
+            merged_link_info = create_merged_link_info_for_propagation(ctx, inherited_merged_link_infos(ctx)),
+            shared_libs = merge_shared_libraries(
                 ctx.actions,
-                deps = inherited_non_rust_shared_libs(ctx),
+                deps = inherited_shared_libs(ctx),
             ),
         ),
     )
@@ -532,27 +532,27 @@ def _rust_providers(
     # non-Rust rules, found by walking through -- and ignoring -- Rust libraries
     # to find non-Rust native linkables and libraries.
     if not ctx.attrs.proc_macro:
-        inherited_non_rust_link_deps = inherited_non_rust_exported_link_deps(ctx)
-        inherited_non_rust_link = inherited_non_rust_link_info(ctx)
-        inherited_non_rust_shlibs = inherited_non_rust_shared_libs(ctx)
+        inherited_link_deps = inherited_exported_link_deps(ctx)
+        inherited_link_infos = inherited_merged_link_infos(ctx)
+        inherited_shlibs = inherited_shared_libs(ctx)
     else:
         # proc-macros are just used by the compiler and shouldn't propagate
         # their native deps to the link line of the target.
-        inherited_non_rust_link = []
-        inherited_non_rust_shlibs = []
-        inherited_non_rust_link_deps = []
+        inherited_link_infos = []
+        inherited_shlibs = []
+        inherited_link_deps = []
 
     providers = []
 
     # Create rust library provider.
     providers.append(RustLinkInfo(
         crate = crate,
         styles = style_info,
-        non_rust_link_info = create_merged_link_info_for_propagation(ctx, inherited_non_rust_link),
-        non_rust_exported_link_deps = inherited_non_rust_link_deps,
-        non_rust_shared_libs = merge_shared_libraries(
+        merged_link_info = create_merged_link_info_for_propagation(ctx, inherited_link_infos),
+        exported_link_deps = inherited_link_deps,
+        shared_libs = merge_shared_libraries(
             ctx.actions,
-            deps = inherited_non_rust_shlibs,
+            deps = inherited_shlibs,
         ),
     ))
 
@@ -571,9 +571,9 @@ def _native_providers(
     dependencies are bundled into the Rust crate itself. We need to break out of
     this mode of operation.
     """
-    inherited_non_rust_link_deps = inherited_non_rust_exported_link_deps(ctx)
-    inherited_non_rust_link = inherited_non_rust_link_info(ctx)
-    inherited_non_rust_shlibs = inherited_non_rust_shared_libs(ctx)
+    inherited_link_deps = inherited_exported_link_deps(ctx)
+    inherited_link_infos = inherited_merged_link_infos(ctx)
+    inherited_shlibs = inherited_shared_libs(ctx)
     linker_info = compile_ctx.cxx_toolchain_info.linker_info
     linker_type = linker_info.type
 
@@ -639,14 +639,14 @@ def _native_providers(
 
     # TODO(cjhopman): This is preserving existing behavior, but it doesn't make sense. These lists can be passed
     # unmerged to create_merged_link_info below. Potentially that could change link order, so needs to be done more carefully.
-    merged_inherited_non_rust_link = create_merged_link_info_for_propagation(ctx, inherited_non_rust_link)
+    merged_inherited_link = create_merged_link_info_for_propagation(ctx, inherited_link_infos)
 
     # Native link provider.
     providers.append(create_merged_link_info(
         ctx,
         compile_ctx.cxx_toolchain_info.pic_behavior,
         link_infos,
-        exported_deps = [merged_inherited_non_rust_link],
+        exported_deps = [merged_inherited_link],
         preferred_linkage = preferred_linkage,
     ))
 
@@ -671,7 +671,7 @@ def _native_providers(
     providers.append(merge_shared_libraries(
         ctx.actions,
         create_shared_libraries(ctx, solibs),
-        inherited_non_rust_shlibs,
+        inherited_shlibs,
     ))
 
     # Omnibus root provider.
@@ -689,7 +689,7 @@ def _native_providers(
                 external_debug_info = external_debug_infos[LibOutputStyle("pic_archive")],
             ),
         ),
-        deps = inherited_non_rust_link_deps,
+        deps = inherited_link_deps,
     )
     providers.append(linkable_root)
 
@@ -704,18 +704,18 @@ def _native_providers(
             linkable_node = create_linkable_node(
                 ctx = ctx,
                 preferred_linkage = preferred_linkage,
-                exported_deps = inherited_non_rust_link_deps,
+                exported_deps = inherited_link_deps,
                 link_infos = link_infos,
                 shared_libs = solibs,
                 default_soname = shlib_name,
             ),
         ),
-        deps = inherited_non_rust_link_deps,
+        deps = inherited_link_deps,
     )
 
     providers.append(linkable_graph)
 
-    providers.append(merge_link_group_lib_info(deps = inherited_non_rust_link_deps))
+    providers.append(merge_link_group_lib_info(deps = inherited_link_deps))
 
     return providers