Skip to content

Commit 443a53f

Browse files
committed
Revert dbgen change
1 parent 8769db0 commit 443a53f

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

coderd/database/dbgen/take.go

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package dbgen
22

3-
import (
4-
"net"
5-
)
3+
import "net"
64

75
func takeFirstIP(values ...net.IPNet) net.IPNet {
6+
takeFirstSlice([]string{})
7+
88
return takeFirstF(values, func(v net.IPNet) bool {
99
return len(v.IP) != 0 && len(v.Mask) != 0
1010
})
@@ -20,16 +20,13 @@ func takeFirstSlice[T any](values ...[]T) []T {
2020

2121
// takeFirstF takes the first value that returns true
2222
func takeFirstF[Value any](values []Value, take func(v Value) bool) Value {
23+
var empty Value
2324
for _, v := range values {
2425
if take(v) {
2526
return v
2627
}
2728
}
28-
// If all empty, return the last element
29-
if len(values) > 0 {
30-
return values[len(values)-1]
31-
}
32-
var empty Value
29+
// If all empty, return empty
3330
return empty
3431
}
3532

0 commit comments

Comments
 (0)