Remove 'cfg = "data"' from all attributes (#1658)
The "data" configuration has been deprecated for a while and has no
effect.
diff --git a/go/private/rules/binary.bzl b/go/private/rules/binary.bzl
index db669b1..46d5bb1 100644
--- a/go/private/rules/binary.bzl
+++ b/go/private/rules/binary.bzl
@@ -46,10 +46,7 @@
_SHARED_ATTRS = {
"basename": attr.string(),
- "data": attr.label_list(
- allow_files = True,
- cfg = "data",
- ),
+ "data": attr.label_list(allow_files = True),
"srcs": attr.label_list(allow_files = go_exts + asm_exts),
"gc_goopts": attr.string_list(),
"gc_linkopts": attr.string_list(),
diff --git a/go/private/rules/library.bzl b/go/private/rules/library.bzl
index 96a7cd6..aae01ba 100644
--- a/go/private/rules/library.bzl
+++ b/go/private/rules/library.bzl
@@ -50,10 +50,7 @@
go_library = go_rule(
_go_library_impl,
attrs = {
- "data": attr.label_list(
- allow_files = True,
- cfg = "data",
- ),
+ "data": attr.label_list(allow_files = True),
"srcs": attr.label_list(allow_files = True),
"deps": attr.label_list(providers = [GoLibrary]),
"importpath": attr.string(),
@@ -72,10 +69,7 @@
"_stdlib",
],
attrs = {
- "data": attr.label_list(
- allow_files = True,
- cfg = "data",
- ),
+ "data": attr.label_list(allow_files = True),
"srcs": attr.label_list(allow_files = True),
"deps": attr.label_list(providers = [GoLibrary]),
"importpath": attr.string(),
diff --git a/go/private/rules/source.bzl b/go/private/rules/source.bzl
index 01b4b81..3ed3723 100644
--- a/go/private/rules/source.bzl
+++ b/go/private/rules/source.bzl
@@ -41,10 +41,7 @@
go_source = go_rule(
_go_source_impl,
attrs = {
- "data": attr.label_list(
- allow_files = True,
- cfg = "data",
- ),
+ "data": attr.label_list(allow_files = True),
"srcs": attr.label_list(allow_files = True),
"deps": attr.label_list(providers = [GoLibrary]),
"embed": attr.label_list(providers = [GoLibrary]),
diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl
index 24673a4..2cbfc44 100644
--- a/go/private/rules/test.bzl
+++ b/go/private/rules/test.bzl
@@ -170,10 +170,7 @@
go_test = go_rule(
_go_test_impl,
attrs = {
- "data": attr.label_list(
- allow_files = True,
- cfg = "data",
- ),
+ "data": attr.label_list(allow_files = True),
"srcs": attr.label_list(allow_files = go_exts + asm_exts),
"deps": attr.label_list(
providers = [GoLibrary],
diff --git a/go/private/tools/path.bzl b/go/private/tools/path.bzl
index 0098f1b..5f19771 100644
--- a/go/private/tools/path.bzl
+++ b/go/private/tools/path.bzl
@@ -53,7 +53,7 @@
if importpath == "":
continue # synthetic archive or inferred location
pkg = struct(
- importpath = importpath,
+ importpath = importpath,
dir = "src/" + pkgpath,
srcs = as_list(archive.orig_srcs),
data = as_list(archive.data_files),
@@ -130,9 +130,12 @@
out_file = tag
args = ctx.actions.args()
args.add_all([
- "-manifest", manifest_file,
- "-out", out_path,
- "-mode", ctx.attr.mode,
+ "-manifest",
+ manifest_file,
+ "-out",
+ out_path,
+ "-mode",
+ ctx.attr.mode,
])
ctx.actions.run(
outputs = outputs,
@@ -158,10 +161,7 @@
_go_path_impl,
attrs = {
"deps": attr.label_list(providers = [GoArchive]),
- "data": attr.label_list(
- allow_files = True,
- cfg = "data",
- ),
+ "data": attr.label_list(allow_files = True),
"mode": attr.string(
default = "copy",
values = [
diff --git a/go/private/tools/vet.bzl b/go/private/tools/vet.bzl
index d1e0edf..ac2223b 100644
--- a/go/private/tools/vet.bzl
+++ b/go/private/tools/vet.bzl
@@ -63,10 +63,7 @@
_go_vet_generate = go_rule(
_go_vet_generate_impl,
attrs = {
- "data": attr.label_list(
- providers = [GoPath],
- cfg = "data",
- ),
+ "data": attr.label_list(providers = [GoPath]),
},
)
