From b0a3f492afad1ae1e78f6631a3fd735983fa4659 Mon Sep 17 00:00:00 2001 From: xu fei <1004815462@qq.com> Date: Wed, 19 Apr 2017 09:30:26 +0800 Subject: [PATCH] remove strings.compare(), use string native operation --- pkg/apis/storage/validation/validation.go | 2 +- pkg/cloudprovider/providers/photon/photon.go | 2 +- pkg/printers/internalversion/printers_test.go | 2 +- .../k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/apis/storage/validation/validation.go b/pkg/apis/storage/validation/validation.go index d72288f9784..029694f0523 100644 --- a/pkg/apis/storage/validation/validation.go +++ b/pkg/apis/storage/validation/validation.go @@ -42,7 +42,7 @@ func ValidateStorageClassUpdate(storageClass, oldStorageClass *storage.StorageCl allErrs = append(allErrs, field.Forbidden(field.NewPath("parameters"), "updates to parameters are forbidden.")) } - if strings.Compare(storageClass.Provisioner, oldStorageClass.Provisioner) != 0 { + if storageClass.Provisioner != oldStorageClass.Provisioner { allErrs = append(allErrs, field.Forbidden(field.NewPath("provisioner"), "updates to provisioner are forbidden.")) } return allErrs diff --git a/pkg/cloudprovider/providers/photon/photon.go b/pkg/cloudprovider/providers/photon/photon.go index f0831e0eec1..c2bb0265361 100644 --- a/pkg/cloudprovider/providers/photon/photon.go +++ b/pkg/cloudprovider/providers/photon/photon.go @@ -622,7 +622,7 @@ func (pc *PCCloud) DiskIsAttached(pdID string, nodeName k8stypes.NodeName) (bool } for _, vm := range disk.VMs { - if strings.Compare(vm, vmID) == 0 { + if vm == vmID { return true, nil } } diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index 172bb81714a..5fdb091072f 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -2143,7 +2143,7 @@ func TestPrintService(t *testing.T) { printService(&test.service, buf, printers.PrintOptions{}) // We ignore time if buf.String() != test.expect { - t.Fatalf("Expected: %s, got: %s %d", test.expect, buf.String(), strings.Compare(test.expect, buf.String())) + t.Fatalf("Expected: %s, but got: %s", test.expect, buf.String()) } buf.Reset() } diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go index 655a66e774f..b1561d7ef49 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/helpers.go @@ -55,7 +55,7 @@ func (s ByPriority) Len() int { return len(s) } func (s ByPriority) Swap(i, j int) { s[i], s[j] = s[j], s[i] } func (s ByPriority) Less(i, j int) bool { if s[i].Spec.Priority == s[j].Spec.Priority { - return strings.Compare(s[i].Name, s[j].Name) < 0 + return s[i].Name < s[j].Name } return s[i].Spec.Priority < s[j].Spec.Priority }