Merge pull request #198 from kolyshkin/user-118

AkihiroSuda · web-flow · commit 9dc3a90b8269 · 2025-08-19T15:16:05.000+09:00
user: bump Go to 1.18, modernize
diff --git a/user/go.mod b/user/go.mod
@@ -1,6 +1,6 @@
 module github.com/moby/sys/user
 
-go 1.17
+go 1.18
 
 require golang.org/x/sys v0.1.0
 
diff --git a/user/lookup_unix.go b/user/lookup_unix.go
@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package user
 
diff --git a/user/user.go b/user/user.go
@@ -56,11 +56,11 @@ type IDMap struct {
 	Count    int64
 }
 
-func parseLine(line []byte, v ...interface{}) {
+func parseLine(line []byte, v ...any) {
 	parseParts(bytes.Split(line, []byte(":")), v...)
 }
 
-func parseParts(parts [][]byte, v ...interface{}) {
+func parseParts(parts [][]byte, v ...any) {
 	if len(parts) == 0 {
 		return
 	}
diff --git a/user/user_fuzzer.go b/user/user_fuzzer.go
@@ -1,5 +1,4 @@
 //go:build gofuzz
-// +build gofuzz
 
 package user
 

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 module github.com/moby/sys/user
 -go 1.17
 +go 1.18
 require golang.org/x/sys v0.1.0
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build darwin \|\| dragonfly \|\| freebsd \|\| linux \|\| netbsd \|\| openbsd \|\| solaris`
`2`		`-// +build darwin dragonfly freebsd linux netbsd openbsd solaris`
`3`	`2`
`4`	`3`	`package user`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -56,11 +56,11 @@ type IDMap struct {`
`56`	`56`	`Count int64`
`57`	`57`	`}`
`58`	`58`
`59`		`-func parseLine(line []byte, v ...interface{}) {`
	`59`	`+func parseLine(line []byte, v ...any) {`
`60`	`60`	`parseParts(bytes.Split(line, []byte(":")), v...)`
`61`	`61`	`}`
`62`	`62`
`63`		`-func parseParts(parts [][]byte, v ...interface{}) {`
	`63`	`+func parseParts(parts [][]byte, v ...any) {`
`64`	`64`	`if len(parts) == 0 {`
`65`	`65`	`return`
`66`	`66`	`}`