Swap typecheck to use go/types stdlib

rksatyam · Oct 25, 2018 · 328c3ce · 328c3ce
1 parent c31d7f5
commit 328c3ce
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/test/typecheck/BUILD b/test/typecheck/BUILD
@@ -18,7 +18,6 @@ go_library(
     importpath = "k8s.io/kubernetes/test/typecheck",
     deps = [
         "//test/typecheck/srcimporter:go_default_library",
-        "//third_party/forked/golang/go/types:go_default_library",
         "//vendor/golang.org/x/crypto/ssh/terminal:go_default_library",
     ],
 )

diff --git a/test/typecheck/main.go b/test/typecheck/main.go
@@ -24,6 +24,7 @@ import (
 	"go/build"
 	"go/parser"
 	"go/token"
+	"go/types"
 	"io"
 	"log"
 	"os"
@@ -35,10 +36,8 @@ import (
 	"time"
 
 	"golang.org/x/crypto/ssh/terminal"
-	// TODO(rmmh): remove this when golang/go#23712 is fixed, and the
-	// fix is the current minimum Go version to build Kubernetes.
+
 	"k8s.io/kubernetes/test/typecheck/srcimporter"
-	"k8s.io/kubernetes/third_party/forked/golang/go/types"
 )
 
 var (

diff --git a/test/typecheck/srcimporter/BUILD b/test/typecheck/srcimporter/BUILD
@@ -5,7 +5,6 @@ go_library(
     srcs = ["srcimporter.go"],
     importpath = "k8s.io/kubernetes/test/typecheck/srcimporter",
     visibility = ["//visibility:public"],
-    deps = ["//third_party/forked/golang/go/types:go_default_library"],
 )
 
 filegroup(

diff --git a/test/typecheck/srcimporter/srcimporter.go b/test/typecheck/srcimporter/srcimporter.go
@@ -30,10 +30,9 @@ import (
 	"go/build"
 	"go/parser"
 	"go/token"
+	"go/types"
 	"path/filepath"
 	"sync"
-
-	"k8s.io/kubernetes/third_party/forked/golang/go/types"
 )
 
 // An Importer provides the context for importing packages from source code.