github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Swap typecheck to use go/types stdlib

Browse Source
This commit is contained in:
Christoph Blecker 2018-10-24 17:39:52 -07:00
parent c31d7f5b26
commit 328c3ce90a
No known key found for this signature in database
GPG Key ID: B34A59A9D39F838B
4 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/typecheck/BUILD
View File

@ -18,7 +18,6 @@ go_library(
importpath = "k8s.io/kubernetes/test/typecheck", importpath = "k8s.io/kubernetes/test/typecheck",
deps = [ deps = [
"//test/typecheck/srcimporter:go_default_library", "//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", "//vendor/golang.org/x/crypto/ssh/terminal:go_default_library",
], ],
) )

5
test/typecheck/main.go
View File

@ -24,6 +24,7 @@ import (
"go/build" "go/build"
"go/parser" "go/parser"
"go/token" "go/token"
"go/types"
"io" "io"
"log" "log"
"os" "os"
@ -35,10 +36,8 @@ import (
"time" "time"
"golang.org/x/crypto/ssh/terminal" "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/test/typecheck/srcimporter"
"k8s.io/kubernetes/third_party/forked/golang/go/types"
) )
var ( var (

1
test/typecheck/srcimporter/BUILD
View File

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

3
test/typecheck/srcimporter/srcimporter.go
View File

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