Bumping k8s dependencies to 1.13
This commit is contained in:
2
vendor/golang.org/x/tools/refactor/eg/eg.go
generated
vendored
2
vendor/golang.org/x/tools/refactor/eg/eg.go
generated
vendored
@@ -322,7 +322,7 @@ func soleExpr(fn *ast.FuncDecl) (ast.Expr, error) {
|
||||
return nil, fmt.Errorf("must contain a single return or expression statement")
|
||||
}
|
||||
|
||||
// stmtAndExpr returns the expression in the last return statement as well as the preceeding lines.
|
||||
// stmtAndExpr returns the expression in the last return statement as well as the preceding lines.
|
||||
func stmtAndExpr(fn *ast.FuncDecl) ([]ast.Stmt, ast.Expr, error) {
|
||||
if fn.Body == nil {
|
||||
return nil, nil, fmt.Errorf("no body")
|
||||
|
4
vendor/golang.org/x/tools/refactor/eg/eg_test.go
generated
vendored
4
vendor/golang.org/x/tools/refactor/eg/eg_test.go
generated
vendored
@@ -11,7 +11,7 @@ package eg_test
|
||||
import (
|
||||
"bytes"
|
||||
"flag"
|
||||
exact "go/constant"
|
||||
"go/constant"
|
||||
"go/parser"
|
||||
"go/token"
|
||||
"go/types"
|
||||
@@ -110,7 +110,7 @@ func Test(t *testing.T) {
|
||||
if err != nil {
|
||||
if shouldFail == nil {
|
||||
t.Errorf("NewTransformer(%s): %s", filename, err)
|
||||
} else if want := exact.StringVal(shouldFail.Val()); !strings.Contains(err.Error(), want) {
|
||||
} else if want := constant.StringVal(shouldFail.Val()); !strings.Contains(err.Error(), want) {
|
||||
t.Errorf("NewTransformer(%s): got error %q, want error %q", filename, err, want)
|
||||
}
|
||||
} else if shouldFail != nil {
|
||||
|
8
vendor/golang.org/x/tools/refactor/eg/match.go
generated
vendored
8
vendor/golang.org/x/tools/refactor/eg/match.go
generated
vendored
@@ -7,7 +7,7 @@ package eg
|
||||
import (
|
||||
"fmt"
|
||||
"go/ast"
|
||||
exact "go/constant"
|
||||
"go/constant"
|
||||
"go/token"
|
||||
"go/types"
|
||||
"log"
|
||||
@@ -67,9 +67,9 @@ func (tr *Transformer) matchExpr(x, y ast.Expr) bool {
|
||||
|
||||
case *ast.BasicLit:
|
||||
y := y.(*ast.BasicLit)
|
||||
xval := exact.MakeFromLiteral(x.Value, x.Kind, 0)
|
||||
yval := exact.MakeFromLiteral(y.Value, y.Kind, 0)
|
||||
return exact.Compare(xval, token.EQL, yval)
|
||||
xval := constant.MakeFromLiteral(x.Value, x.Kind, 0)
|
||||
yval := constant.MakeFromLiteral(y.Value, y.Kind, 0)
|
||||
return constant.Compare(xval, token.EQL, yval)
|
||||
|
||||
case *ast.FuncLit:
|
||||
// func literals (and thus statement syntax) never match.
|
||||
|
2
vendor/golang.org/x/tools/refactor/eg/rewrite.go
generated
vendored
2
vendor/golang.org/x/tools/refactor/eg/rewrite.go
generated
vendored
@@ -202,7 +202,7 @@ func (tr *Transformer) apply(f func(reflect.Value) (reflect.Value, bool, map[str
|
||||
if localchanged {
|
||||
changed = true
|
||||
// we clobber envp here,
|
||||
// which means if we have two sucessive
|
||||
// which means if we have two successive
|
||||
// replacements inside the same statement
|
||||
// we will only generate the setup for one of them.
|
||||
envp = env
|
||||
|
Reference in New Issue
Block a user