Merge pull request kubernetes#90353 from gaurav1086/protofuf_use_sort_Strings

k8s-ci-robot · web-flow · commit 5555cc1cf9bf · 2020-04-24T15:31:58.000-07:00
[Protobuf] simplify sort expression
diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/generator.go
@@ -371,7 +371,7 @@ func (b bodyGen) doStruct(sw *generator.SnippetWriter) error {
 `, b.t)
 
 	if len(options) > 0 {
-		sort.Sort(sort.StringSlice(options))
+		sort.Strings(options)
 		for _, s := range options {
 			fmt.Fprintf(out, "  option %s;\n", s)
 		}
@@ -399,7 +399,7 @@ func (b bodyGen) doStruct(sw *generator.SnippetWriter) error {
 				}
 				extras = append(extras, fmt.Sprintf("%s = %s", k, v))
 			}
-			sort.Sort(sort.StringSlice(extras))
+			sort.Strings(extras)
 			if len(extras) > 0 {
 				fmt.Fprintf(out, " [")
 				fmt.Fprint(out, strings.Join(extras, ", "))

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ func (b bodyGen) doStruct(sw *generator.SnippetWriter) error {`
`371`	`371`	`, b.t)
`372`	`372`
`373`	`373`	`if len(options) > 0 {`
`374`		`- sort.Sort(sort.StringSlice(options))`
	`374`	`+ sort.Strings(options)`
`375`	`375`	`for _, s := range options {`
`376`	`376`	`fmt.Fprintf(out, " option %s;\n", s)`
`377`	`377`	`}`
`@@ -399,7 +399,7 @@ func (b bodyGen) doStruct(sw *generator.SnippetWriter) error {`
`399`	`399`	`}`
`400`	`400`	`extras = append(extras, fmt.Sprintf("%s = %s", k, v))`
`401`	`401`	`}`
`402`		`- sort.Sort(sort.StringSlice(extras))`
	`402`	`+ sort.Strings(extras)`
`403`	`403`	`if len(extras) > 0 {`
`404`	`404`	`fmt.Fprintf(out, " [")`
`405`	`405`	`fmt.Fprint(out, strings.Join(extras, ", "))`