Use named arguments instead of comments (#906) Closes #906 COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_cc/pull/906 from keith:ks/use-named-arguments-instead-of-comments a5169cbb54f0ef3ddcc336bd56fb44d5baa348c8 PiperOrigin-RevId: 993754957 Change-Id: I8963cdc410859edd985730f4d5bc1d35316a0acf
diff --git a/cc/private/link/cc_linking_helper.bzl b/cc/private/link/cc_linking_helper.bzl index 808a34f..42746b1 100644 --- a/cc/private/link/cc_linking_helper.bzl +++ b/cc/private/link/cc_linking_helper.bzl
@@ -590,9 +590,9 @@ actions, name, static_link_type, - False, # use_pic - cc_toolchain, - link_action_kwargs, + use_pic = False, + cc_toolchain = cc_toolchain, + link_action_kwargs = link_action_kwargs, ) pic_library_to_link = {} @@ -609,9 +609,9 @@ actions, name, link_target_type_used_for_naming, - True, # use_pic - cc_toolchain, - link_action_kwargs, + use_pic = True, + cc_toolchain = cc_toolchain, + link_action_kwargs = link_action_kwargs, ) return no_pic_library_to_link | pic_library_to_link
diff --git a/cc/private/link/cpp_link_action.bzl b/cc/private/link/cpp_link_action.bzl index 5e48f56..3f3569e 100644 --- a/cc/private/link/cpp_link_action.bzl +++ b/cc/private/link/cpp_link_action.bzl
@@ -212,31 +212,31 @@ stamping, feature_configuration, cc_toolchain, - "Linking %{output}", # progress_message + progress_message = "Linking %{output}", # Inputs: - object_file_inputs, - non_code_inputs, - libraries_to_link, - linkstamp_map, - linkstamp_object_artifacts, - linkstamp_object_file_inputs, - user_link_flags, + object_file_inputs = object_file_inputs, + non_code_inputs = non_code_inputs, + libraries_to_link = libraries_to_link, + linkstamp_map = linkstamp_map, + linkstamp_object_artifacts = linkstamp_object_artifacts, + linkstamp_object_file_inputs = linkstamp_object_file_inputs, + user_link_flags = user_link_flags, # Custom user input files and variables: - additional_linker_inputs, - build_variables, + additional_linker_inputs = additional_linker_inputs, + additional_build_variables = build_variables, # Outputs: - output, - interface_output, - dynamic_library_solib_symlink_output, - action_outputs, + output = output, + interface_output = interface_output, + dynamic_library_solib_symlink_output = dynamic_library_solib_symlink_output, + action_outputs = action_outputs, # Originating from private APIs: - use_test_only_flags, - whole_archive, - native_deps, - additional_linkstamp_defines, + use_test_only_flags = use_test_only_flags, + whole_archive = whole_archive, + native_deps = native_deps, + additional_linkstamp_defines = additional_linkstamp_defines, # LTO: - lto_mapping, - allow_lto_indexing, + lto_mapping = lto_mapping, + allow_lto_indexing = allow_lto_indexing, ) return output_library, interface_output_library
diff --git a/cc/private/link/create_linking_context_from_compilation_outputs.bzl b/cc/private/link/create_linking_context_from_compilation_outputs.bzl index 13e4923..f8f1c60 100644 --- a/cc/private/link/create_linking_context_from_compilation_outputs.bzl +++ b/cc/private/link/create_linking_context_from_compilation_outputs.bzl
@@ -111,11 +111,11 @@ cc_toolchain, compilation_outputs, linking_contexts, - user_link_flags, # linkopts - stamp, - additional_inputs, # additional_linker_inputs - [], # linker_outputs - variables_extension, + linkopts = user_link_flags, + stamp = stamp, + additional_linker_inputs = additional_inputs, + linker_outputs = [], + variables_extension = variables_extension, alwayslink = alwayslink, test_only_target = test_only_target, linked_dll_name_suffix = linked_dll_name_suffix,
diff --git a/cc/private/link/link.bzl b/cc/private/link/link.bzl index 822506f..993aee8 100644 --- a/cc/private/link/link.bzl +++ b/cc/private/link/link.bzl
@@ -174,21 +174,21 @@ cc_toolchain, compilation_outputs, linking_contexts, - user_link_flags, # linkopts - stamp, - additional_inputs, - additional_outputs, # linker_outputs - variables_extension, - use_test_only_flags, - never_link, # neverlink - test_only_target, - whole_archive, - native_deps, - additional_linkstamp_defines, + linkopts = user_link_flags, + stamp = stamp, + additional_linker_inputs = additional_inputs, + linker_outputs = additional_outputs, + variables_extension = variables_extension, + use_test_only_flags = use_test_only_flags, + neverlink = never_link, + test_only_target = test_only_target, + whole_archive = whole_archive, + native_deps = native_deps, + additional_linkstamp_defines = additional_linkstamp_defines, # alwayslink may be deprecated but we're trying to replicate CcBinary as closely as possible for the moment. # TODO(b/331164666): remove alwayslink, the information is in static_link_type already - always_link, - main_output, # linker_output_artifact + alwayslink = always_link, + linker_output_artifact = main_output, emit_interface_shared_libraries = dynamic_link_type == LINK_TARGET_TYPE.DYNAMIC_LIBRARY and (emit_interface_shared_library or feature_configuration.is_enabled(feature_names.TARGETS_WINDOWS)),
diff --git a/cc/private/link/link_build_variables.bzl b/cc/private/link/link_build_variables.bzl index 51c4337..2e13c38 100644 --- a/cc/private/link/link_build_variables.bzl +++ b/cc/private/link/link_build_variables.bzl
@@ -155,16 +155,16 @@ vars = setup_common_linking_variables( cc_toolchain, feature_configuration, - [], # libraries_to_link - runtime_library_search_directories, - library_search_directories, - user_link_flags, - param_file, - is_using_linker, - is_linking_dynamic_library, - must_keep_debug, - use_test_only_flags, - is_static_linking_mode, + libraries_to_link = [], + runtime_library_search_directories = runtime_library_search_directories, + library_search_directories = library_search_directories, + user_link_flags = user_link_flags, + param_file = param_file, + is_using_linker = is_using_linker, + is_linking_dynamic_library = is_linking_dynamic_library, + must_keep_debug = must_keep_debug, + use_test_only_flags = use_test_only_flags, + is_static_linking_mode = is_static_linking_mode, ) # output exec path
diff --git a/cc/private/link/lto_backends.bzl b/cc/private/link/lto_backends.bzl index 4d96290..6481a31 100644 --- a/cc/private/link/lto_backends.bzl +++ b/cc/private/link/lto_backends.bzl
@@ -411,7 +411,7 @@ all_bitcode_files, dwo_file, use_pic, - None, # bitcode_file_path + bitcode_file_path = None, ) return LtoBackendArtifactsInfo(
diff --git a/cc/private/link/lto_indexing_action.bzl b/cc/private/link/lto_indexing_action.bzl index fd3d7b9..1685eb4 100644 --- a/cc/private/link/lto_indexing_action.bzl +++ b/cc/private/link/lto_indexing_action.bzl
@@ -263,14 +263,14 @@ finalize_link_action( actions, - "CppLTOIndexing", # mnemonic - action_name, - link_type, - linking_mode, - False, # stamping (we don't have linkstamps, nothing to stamp) - feature_configuration, - cc_toolchain, - "LTO indexing %{output}", # progress_message + mnemonic = "CppLTOIndexing", + action_name = action_name, + link_type = link_type, + linking_mode = linking_mode, + stamping = False, # we don't have linkstamps, nothing to stamp + feature_configuration = feature_configuration, + cc_toolchain = cc_toolchain, + progress_message = "LTO indexing %{output}", # Inputs: object_file_inputs = object_file_inputs, libraries_to_link = libraries_to_link,
diff --git a/cc/private/rules_impl/cc_binary_impl.bzl b/cc/private/rules_impl/cc_binary_impl.bzl index fc4c2b2..77695a3 100644 --- a/cc/private/rules_impl/cc_binary_impl.bzl +++ b/cc/private/rules_impl/cc_binary_impl.bzl
@@ -120,7 +120,7 @@ cc_toolchain, feature_configuration, ctx, - False, # generate_hidden_top_level_group + generate_hidden_top_level_group = False, ) cc_info = CcInfo( compilation_context = compilation_context,