Merge pull request #64506 from wgliang/master.simple-string

Automatic merge from submit-queue (batch tested with PRs 64688, 64451, 64504, 64506, 56358). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

replace fmt.Sprintf(%s, i.Type()) with i.Type().String()

**What this PR does / why we need it**:
/kind cleanup

replace fmt.Sprintf(%s, i.Type()) with i.Type().String()

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
NONE
```

Kubernetes-commit: b309d18a48d8054904fe88fdc49cae33a276f722
This commit is contained in:
Kubernetes Publisher 2018-06-20 05:48:19 -07:00
commit 70f02b11c6
2 changed files with 55 additions and 55 deletions

102
Godeps/Godeps.json generated
View File

@ -1,6 +1,6 @@
{
"ImportPath": "k8s.io/client-go",
"GoVersion": "go1.9",
"GoVersion": "go1.10",
"GodepVersion": "v80",
"Packages": [
"./..."
@ -388,203 +388,203 @@
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/version",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "5a8013207d0d28c7fe98193e5b6cdbf92e98a000"
"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
},
{
"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",

View File

@ -80,7 +80,7 @@ func (l *ListNode) append(n Node) {
}
func (l *ListNode) String() string {
return fmt.Sprintf("%s", l.Type())
return l.Type().String()
}
// TextNode holds plain text.
@ -210,7 +210,7 @@ func newWildcard() *WildcardNode {
}
func (i *WildcardNode) String() string {
return fmt.Sprintf("%s", i.Type())
return i.Type().String()
}
// RecursiveNode means a recursive descent operator
@ -223,7 +223,7 @@ func newRecursive() *RecursiveNode {
}
func (r *RecursiveNode) String() string {
return fmt.Sprintf("%s", r.Type())
return r.Type().String()
}
// UnionNode is union of ListNode
@ -237,7 +237,7 @@ func newUnion(nodes []*ListNode) *UnionNode {
}
func (u *UnionNode) String() string {
return fmt.Sprintf("%s", u.Type())
return u.Type().String()
}
// BoolNode holds bool value