Skip to content

Commit 3fa0b1a

Browse files
committed
Remove enable_swift flag
1 parent 81232d8 commit 3fa0b1a

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

refresh.template.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -935,19 +935,14 @@ def _get_commands(target: str, flags: str):
935935
Try adding them as flags in your refresh_compile_commands rather than targets.
936936
In a moment, Bazel will likely fail to parse.""")
937937

938-
support_mnemonics = ["Objc", "Cpp"]
939-
if {enable_swift}:
940-
support_mnemonics += ["Swift"]
941-
mnemonics_string = '|'.join(support_mnemonics)
942-
943938
# First, query Bazel's C-family compile actions for that configured target
944939
aquery_args = [
945940
'bazel',
946941
'aquery',
947942
# Aquery docs if you need em: https://docs.bazel.build/versions/master/aquery.html
948943
# Aquery output proto reference: https://github.com/bazelbuild/bazel/blob/master/src/main/protobuf/analysis_v2.proto
949944
# One bummer, not described in the docs, is that aquery filters over *all* actions for a given target, rather than just those that would be run by a build to produce a given output. This mostly isn't a problem, but can sometimes surface extra, unnecessary, misconfigured actions. Chris has emailed the authors to discuss and filed an issue so anyone reading this could track it: https://github.com/bazelbuild/bazel/issues/14156.
950-
f"mnemonic('({mnemonics_string})Compile',deps({target}))",
945+
f"mnemonic('(Objc|Cpp|Swift)Compile',deps({target}))",
951946
# We switched to jsonproto instead of proto because of https://github.com/bazelbuild/bazel/issues/13404. We could change back when fixed--reverting most of the commit that added this line and tweaking the build file to depend on the target in that issue. That said, it's kinda nice to be free of the dependency, unless (OPTIMNOTE) jsonproto becomes a performance bottleneck compated to binary protos.
952947
'--output=jsonproto',
953948
# We'll disable artifact output for efficiency, since it's large and we don't use them. Small win timewise, but dramatically less json output from aquery.

refresh_compile_commands.bzl

+2-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ def refresh_compile_commands(
6363
targets = None,
6464
exclude_headers = None,
6565
exclude_external_sources = False,
66-
enable_swift = False,
6766
**kwargs): # For the other common attributes. Tags, compatible_with, etc. https://docs.bazel.build/versions/main/be/common-definitions.html#common-attributes.
6867
# Convert the various, acceptable target shorthands into the dictionary format
6968
# In Python, `type(x) == y` is an antipattern, but [Starlark doesn't support inheritance](https://bazel.build/rules/language), so `isinstance` doesn't exist, and this is the correct way to switch on type.
@@ -80,7 +79,7 @@ def refresh_compile_commands(
8079

8180
# Generate runnable python script from template
8281
script_name = name + ".py"
83-
_expand_template(name = script_name, labels_to_flags = targets, exclude_headers = exclude_headers, exclude_external_sources = exclude_external_sources, enable_swift = enable_swift, **kwargs)
82+
_expand_template(name = script_name, labels_to_flags = targets, exclude_headers = exclude_headers, exclude_external_sources = exclude_external_sources, **kwargs)
8483
native.py_binary(name = name, srcs = [script_name], **kwargs)
8584

8685
def _expand_template_impl(ctx):
@@ -95,8 +94,7 @@ def _expand_template_impl(ctx):
9594
" {target_flag_pairs}": "\n".join([" {},".format(pair) for pair in ctx.attr.labels_to_flags.items()]),
9695
" {windows_default_include_paths}": "\n".join([" %r," % path for path in find_cpp_toolchain(ctx).built_in_include_directories]), # find_cpp_toolchain is from https://docs.bazel.build/versions/main/integrating-with-rules-cc.html
9796
"{exclude_headers}": '"' + str(ctx.attr.exclude_headers) + '"',
98-
"{exclude_external_sources}": str(ctx.attr.exclude_external_sources),
99-
"{enable_swift}": str(ctx.attr.enable_swift),
97+
"{exclude_external_sources}": str(ctx.attr.exclude_external_sources)
10098
},
10199
)
102100
return DefaultInfo(files = depset([script]))
@@ -106,7 +104,6 @@ _expand_template = rule(
106104
"labels_to_flags": attr.string_dict(mandatory = True), # string keys instead of label_keyed because Bazel doesn't support parsing wildcard target patterns (..., *, :all) in BUILD attributes.
107105
"exclude_external_sources": attr.bool(default = False),
108106
"exclude_headers": attr.string(values = ["all", "external", ""]), # "" needed only for compatibility with Bazel < 3.6.0
109-
"enable_swift": attr.bool(default = False),
110107
"_script_template": attr.label(allow_single_file = True, default = "refresh.template.py"),
111108
"_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), # For Windows INCLUDE. If this were eliminated, for example by the resolution of https://github.com/clangd/clangd/issues/123, we'd be able to just use a macro and skylib's expand_template rule: https://github.com/bazelbuild/bazel-skylib/pull/330
112109
},

0 commit comments

Comments
 (0)