review feedback 2

bazel-contrib · Jun 27, 2022 · 272b85b · 272b85b
1 parent 351b604
commit 272b85b
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 17 deletions.
diff --git a/internal/go_repository_tools_srcs.bzl b/internal/go_repository_tools_srcs.bzl
@@ -45,7 +45,7 @@ GO_REPOSITORY_TOOLS_SRCS = [
 	"@bazel_gazelle//label:label.go",
 	"@bazel_gazelle//language:BUILD.bazel",
 	"@bazel_gazelle//language/go:BUILD.bazel",
-	"@bazel_gazelle//language/go:build_tags.go",
+	"@bazel_gazelle//language/go:build_constraints.go",
 	"@bazel_gazelle//language/go:config.go",
 	"@bazel_gazelle//language/go:constants.go",
 	"@bazel_gazelle//language/go:dep.go",

diff --git a/language/go/BUILD.bazel b/language/go/BUILD.bazel
@@ -15,7 +15,7 @@ std_package_list(
 go_library(
     name = "go",
     srcs = [
-        "build_tags.go",
+        "build_constraints.go",
         "config.go",
         "constants.go",
         "dep.go",
@@ -56,7 +56,7 @@ go_library(
 go_test(
     name = "go_test",
     srcs = [
-        "build_tags_test.go",
+        "build_constraints_test.go",
         "config_test.go",
         "fileinfo_go_test.go",
         "fileinfo_test.go",
@@ -91,8 +91,8 @@ filegroup(
     testonly = True,
     srcs = [
         "BUILD.bazel",
-        "build_tags.go",
-        "build_tags_test.go",
+        "build_constraints.go",
+        "build_constraints_test.go",
         "config.go",
         "config_test.go",
         "constants.go",

diff --git a/language/go/build_tags.go → language/go/build_constraints.go b/language/go/build_tags.go → language/go/build_constraints.go
@@ -144,7 +144,7 @@ func (b *buildTags) empty() bool {
 	return len(b.rawTags) == 0
 }
 
-// dropNegationForIgnoredTags wil drop negations for any concrete tags that should be ignored.
+// dropNegationForIgnoredTags drops negations for any concrete tags that should be ignored.
 // This is done to ensure that when ignored tags are evaluated, they can always return true
 // without having to worry that the result will be negated later on. Ignored tags should always
 // evaluate to true, regardless of whether they are negated or not leaving the final evaluation

diff --git a/language/go/build_tags_test.go → language/go/build_constraints_test.go b/language/go/build_tags_test.go → language/go/build_constraints_test.go
diff --git a/language/go/testdata/platforms/BUILD.want b/language/go/testdata/platforms/BUILD.want
@@ -7,6 +7,9 @@ go_library(
         "cgo_generic.go",
         "cgo_linux.c",
         "cgo_linux.go",
+        "constraints_dual_cgo.go",
+        "constraints_dual_no_cgo.go",
+        "constraints_verify_demorgans_law.go",
         "generic.go",
         "new_tag_a.go",
         "no_cgo.go",
@@ -18,9 +21,6 @@ go_library(
         "tag_a.go",
         "tag_d.go",
         "tag_l.go",
-        "tags_dual_cgo.go",
-        "tags_dual_no_cgo.go",
-        "tags_verify_demorgans_law.go",
     ],
     _gazelle_imports = [
         "example.com/repo/platforms/generic",

diff --git a/language/go/testdata/platforms/constraints_dual_cgo.go b/language/go/testdata/platforms/constraints_dual_cgo.go
@@ -0,0 +1,7 @@
+// +build cgo
+// +build !appengine
+//
+// cgo && !appengine == true ∵
+// cgo == true && appengine == undefined
+
+package platforms
diff --git a/language/go/testdata/platforms/constraints_dual_no_cgo.go b/language/go/testdata/platforms/constraints_dual_no_cgo.go
@@ -0,0 +1,6 @@
+// +build !cgo appengine
+//
+// !cgo || appengine == true ∵
+// !cgo == true
+
+package platforms
diff --git a/...ta/platforms/tags_verify_demorgans_law.go → ...forms/constraints_verify_demorgans_law.go b/...ta/platforms/tags_verify_demorgans_law.go → ...forms/constraints_verify_demorgans_law.go
@@ -1,3 +1,4 @@
 //go:build !(go1.15 || go1.14)
-
+//
+// ≡ go1.15 && go1.14 == true
 package platforms
diff --git a/language/go/testdata/platforms/tags_dual_cgo.go b/language/go/testdata/platforms/tags_dual_cgo.go
diff --git a/language/go/testdata/platforms/tags_dual_no_cgo.go b/language/go/testdata/platforms/tags_dual_no_cgo.go