Update org_golang_x_tools to master as of 2018-08-15 (#1662)

bazel-contrib · Aug 16, 2018 · 85e4eab · 85e4eab
1 parent 0b98d55
commit 85e4eab
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
@@ -31,9 +31,9 @@ def go_rules_dependencies():
     _maybe(
         http_archive,
         name = "org_golang_x_tools",
-        # master, as of 2018-08-07
-        urls = ["https://codeload.github.com/golang/tools/zip/3c07937fe18c27668fd78bbaed3d6b8b39e202ea"],
-        strip_prefix = "tools-3c07937fe18c27668fd78bbaed3d6b8b39e202ea",
+        # master, as of 2018-08-15
+        urls = ["https://codeload.github.com/golang/tools/zip/8f8fd1f23985f19c387c894e5597b22d8256a495"],
+        strip_prefix = "tools-8f8fd1f23985f19c387c894e5597b22d8256a495",
         type = "zip",
         overlay = manifest["org_golang_x_tools"],
         # importpath = "golang.org/x/tools",

diff --git a/third_party/manifest.bzl b/third_party/manifest.bzl
@@ -777,9 +777,7 @@ manifest = {
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/loader/BUILD.bazel.in": "go/loader/BUILD.bazel",
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/loader/testdata/BUILD.bazel.in": "go/loader/testdata/BUILD.bazel",
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/packages/BUILD.bazel.in": "go/packages/BUILD.bazel",
-        "@io_bazel_rules_go//third_party:org_golang_x_tools/go/packages/golist/BUILD.bazel.in": "go/packages/golist/BUILD.bazel",
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/packages/gopackages/BUILD.bazel.in": "go/packages/gopackages/BUILD.bazel",
-        "@io_bazel_rules_go//third_party:org_golang_x_tools/go/packages/raw/BUILD.bazel.in": "go/packages/raw/BUILD.bazel",
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/pointer/BUILD.bazel.in": "go/pointer/BUILD.bazel",
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/pointer/testdata/BUILD.bazel.in": "go/pointer/testdata/BUILD.bazel",
         "@io_bazel_rules_go//third_party:org_golang_x_tools/go/ssa/BUILD.bazel.in": "go/ssa/BUILD.bazel",

diff --git a/third_party/org_golang_x_tools/cmd/callgraph/BUILD.bazel.in b/third_party/org_golang_x_tools/cmd/callgraph/BUILD.bazel.in
@@ -11,7 +11,7 @@ go_library(
         "//go/callgraph/cha:go_default_library",
         "//go/callgraph/rta:go_default_library",
         "//go/callgraph/static:go_default_library",
-        "//go/loader:go_default_library",
+        "//go/packages:go_default_library",
         "//go/pointer:go_default_library",
         "//go/ssa:go_default_library",
         "//go/ssa/ssautil:go_default_library",

diff --git a/third_party/org_golang_x_tools/cmd/ssadump/BUILD.bazel.in b/third_party/org_golang_x_tools/cmd/ssadump/BUILD.bazel.in
@@ -7,7 +7,7 @@ go_library(
     visibility = ["//visibility:private"],
     deps = [
         "//go/buildutil:go_default_library",
-        "//go/loader:go_default_library",
+        "//go/packages:go_default_library",
         "//go/ssa:go_default_library",
         "//go/ssa/interp:go_default_library",
         "//go/ssa/ssautil:go_default_library",

diff --git a/third_party/org_golang_x_tools/go/packages/BUILD.bazel.in b/third_party/org_golang_x_tools/go/packages/BUILD.bazel.in
@@ -5,14 +5,15 @@ go_library(
     srcs = [
         "doc.go",
         "external.go",
+        "golist.go",
+        "golist_fallback.go",
         "packages.go",
     ],
     importpath = "golang.org/x/tools/go/packages",
     visibility = ["//visibility:public"],
     deps = [
         "//go/gcexportdata:go_default_library",
-        "//go/packages/golist:go_default_library",
-        "//go/packages/raw:go_default_library",
+        "//go/internal/cgo:go_default_library",
     ],
 )
 

diff --git a/third_party/org_golang_x_tools/go/ssa/BUILD.bazel.in b/third_party/org_golang_x_tools/go/ssa/BUILD.bazel.in
@@ -48,6 +48,7 @@ go_test(
     deps = [
         "//go/ast/astutil:go_default_library",
         "//go/loader:go_default_library",
+        "//go/packages:go_default_library",
         "//go/ssa/ssautil:go_default_library",
     ] + select({
         "@io_bazel_rules_go//go/platform:darwin": [

diff --git a/third_party/org_golang_x_tools/go/ssa/ssautil/BUILD.bazel.in b/third_party/org_golang_x_tools/go/ssa/ssautil/BUILD.bazel.in
@@ -11,6 +11,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "//go/loader:go_default_library",
+        "//go/packages:go_default_library",
         "//go/ssa:go_default_library",
     ],
 )
@@ -23,7 +24,9 @@ go_test(
     ],
     data = glob(["testdata/**"]),
     embed = [":go_default_library"],
-    deps = select({
+    deps = [
+        "//go/packages:go_default_library",
+    ] + select({
         "@io_bazel_rules_go//go/platform:darwin": [
             "//go/loader:go_default_library",
             "//go/ssa:go_default_library",