Skip to content

Commit 01aaa83

Browse files
tklausergopherbot
tklauser
authored and
gopherbot
committed
all: simplify code by using modern Go constructs
Generated using modernize by running: go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./... Change-Id: Ifc7d61cf6735cc53f2bdf890a338961f55075af5 Reviewed-on: https://go-review.googlesource.com/c/sys/+/661975 Auto-Submit: Tobias Klauser <[email protected]> Reviewed-by: Carlos Amedee <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Dmitri Shuralyov <[email protected]>
1 parent 1b2bd6b commit 01aaa83

File tree

8 files changed

+33
-54
lines changed

8 files changed

+33
-54
lines changed

‎cpu/parse.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ import "strconv"
1313
// https://golang.org/cl/209597.
1414
func parseRelease(rel string) (major, minor, patch int, ok bool) {
1515
// Strip anything after a dash or plus.
16-
for i := 0; i < len(rel); i++ {
16+
for i := range len(rel) {
1717
if rel[i] == '-' || rel[i] == '+' {
1818
rel = rel[:i]
1919
break
2020
}
2121
}
2222

2323
next := func() (int, bool) {
24-
for i := 0; i < len(rel); i++ {
24+
for i := range len(rel) {
2525
if rel[i] == '.' {
2626
ver, err := strconv.Atoi(rel[:i])
2727
rel = rel[i+1:]

‎unix/dirent_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func TestDirentRepeat(t *testing.T) {
107107
d := t.TempDir()
108108

109109
var files []string
110-
for i := 0; i < N; i++ {
110+
for i := range N {
111111
files = append(files, fmt.Sprintf("file%d", i))
112112
}
113113
for _, file := range files {

‎unix/fdset_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ import (
1515
func TestFdSet(t *testing.T) {
1616
var fdSet unix.FdSet
1717
fdSet.Zero()
18-
for fd := 0; fd < unix.FD_SETSIZE; fd++ {
18+
for fd := range unix.FD_SETSIZE {
1919
if fdSet.IsSet(fd) {
2020
t.Fatalf("Zero did not clear fd %d", fd)
2121
}
2222
fdSet.Set(fd)
2323
}
2424

25-
for fd := 0; fd < unix.FD_SETSIZE; fd++ {
25+
for fd := range unix.FD_SETSIZE {
2626
if !fdSet.IsSet(fd) {
2727
t.Fatalf("IsSet(%d): expected true, got false", fd)
2828
}
2929
}
3030

3131
fdSet.Zero()
32-
for fd := 0; fd < unix.FD_SETSIZE; fd++ {
32+
for fd := range unix.FD_SETSIZE {
3333
if fdSet.IsSet(fd) {
3434
t.Fatalf("Zero did not clear fd %d", fd)
3535
}
@@ -39,7 +39,7 @@ func TestFdSet(t *testing.T) {
3939
fdSet.Set(fd)
4040
}
4141

42-
for fd := 0; fd < unix.FD_SETSIZE; fd++ {
42+
for fd := range unix.FD_SETSIZE {
4343
if fd&0x1 == 0x1 {
4444
if !fdSet.IsSet(fd) {
4545
t.Fatalf("IsSet(%d): expected true, got false", fd)
@@ -55,7 +55,7 @@ func TestFdSet(t *testing.T) {
5555
fdSet.Clear(fd)
5656
}
5757

58-
for fd := 0; fd < unix.FD_SETSIZE; fd++ {
58+
for fd := range unix.FD_SETSIZE {
5959
if fdSet.IsSet(fd) {
6060
t.Fatalf("Clear(%d) did not clear fd", fd)
6161
}

‎unix/internal/mkmerge/mkmerge.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ type filterFn func(codeElem) bool
137137
// filter parses and filters Go source code from src, removing top
138138
// level declarations using keep as predicate.
139139
// For src parameter, please see docs for parser.ParseFile.
140-
func filter(src interface{}, keep filterFn) ([]byte, error) {
140+
func filter(src any, keep filterFn) ([]byte, error) {
141141
// Parse the src into an ast
142142
fset := token.NewFileSet()
143143
f, err := parser.ParseFile(fset, "", src, parser.ParseComments)
@@ -243,7 +243,7 @@ func getCommonSet(files []srcFile) (*codeSet, error) {
243243

244244
// getCodeSet returns the set of all top-level consts, types, and funcs from src.
245245
// src must be string, []byte, or io.Reader (see go/parser.ParseFile docs)
246-
func getCodeSet(src interface{}) (*codeSet, error) {
246+
func getCodeSet(src any) (*codeSet, error) {
247247
set := newCodeSet()
248248

249249
fset := token.NewFileSet()

‎unix/internal/mkmerge/mkmerge_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ func diffLines(t *testing.T, got, expected []byte) {
498498
func addLineNr(src []byte) []byte {
499499
lines := bytes.Split(src, []byte("\n"))
500500
for i, line := range lines {
501-
lines[i] = []byte(fmt.Sprintf("%d: %s", i+1, line))
501+
lines[i] = fmt.Appendf(nil, "%d: %s", i+1, line)
502502
}
503503
return bytes.Join(lines, []byte("\n"))
504504
}

‎unix/syscall_linux.go‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ package unix
1313

1414
import (
1515
"encoding/binary"
16+
"slices"
1617
"strconv"
1718
"syscall"
1819
"time"
@@ -417,7 +418,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
417418
return nil, 0, EINVAL
418419
}
419420
sa.raw.Family = AF_UNIX
420-
for i := 0; i < n; i++ {
421+
for i := range n {
421422
sa.raw.Path[i] = int8(name[i])
422423
}
423424
// length is family (uint16), name, NUL.
@@ -507,7 +508,7 @@ func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
507508
psm := (*[2]byte)(unsafe.Pointer(&sa.raw.Psm))
508509
psm[0] = byte(sa.PSM)
509510
psm[1] = byte(sa.PSM >> 8)
510-
for i := 0; i < len(sa.Addr); i++ {
511+
for i := range len(sa.Addr) {
511512
sa.raw.Bdaddr[i] = sa.Addr[len(sa.Addr)-1-i]
512513
}
513514
cid := (*[2]byte)(unsafe.Pointer(&sa.raw.Cid))
@@ -589,11 +590,11 @@ func (sa *SockaddrCAN) sockaddr() (unsafe.Pointer, _Socklen, error) {
589590
sa.raw.Family = AF_CAN
590591
sa.raw.Ifindex = int32(sa.Ifindex)
591592
rx := (*[4]byte)(unsafe.Pointer(&sa.RxID))
592-
for i := 0; i < 4; i++ {
593+
for i := range 4 {
593594
sa.raw.Addr[i] = rx[i]
594595
}
595596
tx := (*[4]byte)(unsafe.Pointer(&sa.TxID))
596-
for i := 0; i < 4; i++ {
597+
for i := range 4 {
597598
sa.raw.Addr[i+4] = tx[i]
598599
}
599600
return unsafe.Pointer(&sa.raw), SizeofSockaddrCAN, nil
@@ -618,11 +619,11 @@ func (sa *SockaddrCANJ1939) sockaddr() (unsafe.Pointer, _Socklen, error) {
618619
sa.raw.Family = AF_CAN
619620
sa.raw.Ifindex = int32(sa.Ifindex)
620621
n := (*[8]byte)(unsafe.Pointer(&sa.Name))
621-
for i := 0; i < 8; i++ {
622+
for i := range 8 {
622623
sa.raw.Addr[i] = n[i]
623624
}
624625
p := (*[4]byte)(unsafe.Pointer(&sa.PGN))
625-
for i := 0; i < 4; i++ {
626+
for i := range 4 {
626627
sa.raw.Addr[i+8] = p[i]
627628
}
628629
sa.raw.Addr[12] = sa.Addr
@@ -911,7 +912,7 @@ func (sa *SockaddrIUCV) sockaddr() (unsafe.Pointer, _Socklen, error) {
911912
// These are EBCDIC encoded by the kernel, but we still need to pad them
912913
// with blanks. Initializing with blanks allows the caller to feed in either
913914
// a padded or an unpadded string.
914-
for i := 0; i < 8; i++ {
915+
for i := range 8 {
915916
sa.raw.Nodeid[i] = ' '
916917
sa.raw.User_id[i] = ' '
917918
sa.raw.Name[i] = ' '
@@ -1148,7 +1149,7 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
11481149
var user [8]byte
11491150
var name [8]byte
11501151

1151-
for i := 0; i < 8; i++ {
1152+
for i := range 8 {
11521153
user[i] = byte(pp.User_id[i])
11531154
name[i] = byte(pp.Name[i])
11541155
}
@@ -1173,11 +1174,11 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
11731174
Ifindex: int(pp.Ifindex),
11741175
}
11751176
name := (*[8]byte)(unsafe.Pointer(&sa.Name))
1176-
for i := 0; i < 8; i++ {
1177+
for i := range 8 {
11771178
name[i] = pp.Addr[i]
11781179
}
11791180
pgn := (*[4]byte)(unsafe.Pointer(&sa.PGN))
1180-
for i := 0; i < 4; i++ {
1181+
for i := range 4 {
11811182
pgn[i] = pp.Addr[i+8]
11821183
}
11831184
addr := (*[1]byte)(unsafe.Pointer(&sa.Addr))
@@ -1188,11 +1189,11 @@ func anyToSockaddr(fd int, rsa *RawSockaddrAny) (Sockaddr, error) {
11881189
Ifindex: int(pp.Ifindex),
11891190
}
11901191
rx := (*[4]byte)(unsafe.Pointer(&sa.RxID))
1191-
for i := 0; i < 4; i++ {
1192+
for i := range 4 {
11921193
rx[i] = pp.Addr[i]
11931194
}
11941195
tx := (*[4]byte)(unsafe.Pointer(&sa.TxID))
1195-
for i := 0; i < 4; i++ {
1196+
for i := range 4 {
11961197
tx[i] = pp.Addr[i+4]
11971198
}
11981199
return sa, nil
@@ -2216,10 +2217,7 @@ func readvRacedetect(iovecs []Iovec, n int, err error) {
22162217
return
22172218
}
22182219
for i := 0; n > 0 && i < len(iovecs); i++ {
2219-
m := int(iovecs[i].Len)
2220-
if m > n {
2221-
m = n
2222-
}
2220+
m := min(int(iovecs[i].Len), n)
22232221
n -= m
22242222
if m > 0 {
22252223
raceWriteRange(unsafe.Pointer(iovecs[i].Base), m)
@@ -2270,10 +2268,7 @@ func writevRacedetect(iovecs []Iovec, n int) {
22702268
return
22712269
}
22722270
for i := 0; n > 0 && i < len(iovecs); i++ {
2273-
m := int(iovecs[i].Len)
2274-
if m > n {
2275-
m = n
2276-
}
2271+
m := min(int(iovecs[i].Len), n)
22772272
n -= m
22782273
if m > 0 {
22792274
raceReadRange(unsafe.Pointer(iovecs[i].Base), m)
@@ -2320,12 +2315,7 @@ func isGroupMember(gid int) bool {
23202315
return false
23212316
}
23222317

2323-
for _, g := range groups {
2324-
if g == gid {
2325-
return true
2326-
}
2327-
}
2328-
return false
2318+
return slices.Contains(groups, gid)
23292319
}
23302320

23312321
func isCapDacOverrideSet() bool {

‎unix/syscall_linux_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ func TestTime(t *testing.T) {
367367

368368
var now time.Time
369369

370-
for i := 0; i < 10; i++ {
370+
for range 10 {
371371
ut, err = unix.Time(nil)
372372
if err != nil {
373373
t.Fatalf("Time: %v", err)
@@ -555,7 +555,7 @@ func TestSchedSetaffinity(t *testing.T) {
555555
cpu = 1
556556
if !oldMask.IsSet(cpu) {
557557
newMask.Zero()
558-
for i := 0; i < len(oldMask); i++ {
558+
for i := range len(oldMask) {
559559
if oldMask.IsSet(i) {
560560
newMask.Set(i)
561561
break
@@ -878,7 +878,7 @@ func openMountByID(mountID int) (f *os.File, err error) {
878878
}
879879
defer mi.Close()
880880
bs := bufio.NewScanner(mi)
881-
wantPrefix := []byte(fmt.Sprintf("%v ", mountID))
881+
wantPrefix := fmt.Appendf(nil, "%v ", mountID)
882882
for bs.Scan() {
883883
if !bytes.HasPrefix(bs.Bytes(), wantPrefix) {
884884
continue

‎unix/xattr_test.go‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"os"
1111
"path/filepath"
1212
"runtime"
13+
"slices"
1314
"strings"
1415
"testing"
1516

@@ -62,13 +63,7 @@ func TestXattr(t *testing.T) {
6263
// name and Listxattr doesn't return the namespace prefix.
6364
xattrWant = strings.TrimPrefix(xattrWant, "user.")
6465
}
65-
found := false
66-
for _, name := range xattrs {
67-
if name == xattrWant {
68-
found = true
69-
break
70-
}
71-
}
66+
found := slices.Contains(xattrs, xattrWant)
7267

7368
if !found {
7469
t.Errorf("Listxattr did not return previously set attribute %q in attributes %v", xattrName, xattrs)
@@ -170,13 +165,7 @@ func TestFdXattr(t *testing.T) {
170165
// name and Listxattr doesn't return the namespace prefix.
171166
xattrWant = strings.TrimPrefix(xattrWant, "user.")
172167
}
173-
found := false
174-
for _, name := range xattrs {
175-
if name == xattrWant {
176-
found = true
177-
break
178-
}
179-
}
168+
found := slices.Contains(xattrs, xattrWant)
180169

181170
if !found {
182171
t.Errorf("Flistxattr did not return previously set attribute %q in attributes %v", xattrName, xattrs)

0 commit comments

Comments
 (0)