Skip to content

Commit c074b74

Browse files
authored
Merge pull request #6200 from jinjiadu/master
refactor: use slices.Equal to simplify code
2 parents 0b008b7 + 031d550 commit c074b74

2 files changed

Lines changed: 3 additions & 14 deletions

File tree

.changelog/6200.trivial.md

Whitespace-only changes.

go/oasis-test-runner/oasis/args.go

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package oasis
33
import (
44
"encoding/hex"
55
"fmt"
6+
"slices"
67
"strconv"
78

89
beacon "github.com/oasisprotocol/oasis-core/go/beacon/api"
@@ -182,23 +183,11 @@ func (args *argBuilder) merge(string) []string {
182183
shipped := map[string][]string{}
183184
multiValued := map[string][][]string{}
184185

185-
slicesEqual := func(s1, s2 []string) bool {
186-
if len(s1) != len(s2) {
187-
return false
188-
}
189-
for i := range s1 {
190-
if s1[i] != s2[i] {
191-
return false
192-
}
193-
}
194-
return true
195-
}
196-
197186
for _, arg := range args.vec {
198187
if arg.MultiValued {
199188
ok := true
200189
for _, el := range multiValued[arg.Name] {
201-
if slicesEqual(el, arg.Values) {
190+
if slices.Equal(el, arg.Values) {
202191
ok = false
203192
break
204193
}
@@ -215,7 +204,7 @@ func (args *argBuilder) merge(string) []string {
215204
output = append(output, arg.Values...)
216205
shipped[arg.Name] = arg.Values
217206
} else {
218-
if !slicesEqual(vals, arg.Values) {
207+
if !slices.Equal(vals, arg.Values) {
219208
panic(fmt.Sprintf("args: single-valued argument given multiple times with different values (%s)", arg.Name))
220209
}
221210
}

0 commit comments

Comments
 (0)