Merge pull request #1510 from smallstep/dependabot/go_modules/github.com/ccoveille/go-safecast-1.8.1

step-ci · web-flow · commit ce1fb68a4907 · 2025-11-04T04:27:32.000-06:00
Bump github.com/ccoveille/go-safecast from 1.7.0 to 1.8.1
diff --git a/command/ca/acme/eab/sigchild.go b/command/ca/acme/eab/sigchild.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 package eab
 
diff --git a/command/ca/acme/eab/sigchild_windows.go b/command/ca/acme/eab/sigchild_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package eab
 
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.24.0
 
 require (
 	github.com/Microsoft/go-winio v0.6.2
-	github.com/ccoveille/go-safecast v1.7.0
+	github.com/ccoveille/go-safecast v1.8.1
 	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/go-jose/go-jose/v3 v3.0.4
 	github.com/google/go-cmp v0.7.0
diff --git a/go.sum b/go.sum
@@ -84,8 +84,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
 github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/ccoveille/go-safecast v1.7.0 h1:i+0eldPFBeXCTARGyocNS6BNRomquA/GhTZVNEtaIXI=
-github.com/ccoveille/go-safecast v1.7.0/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8=
+github.com/ccoveille/go-safecast v1.8.1 h1:RoucjfYKKcx2lFmIjRjuo8AeX9k/GaZn5SUMHlA3kMw=
+github.com/ccoveille/go-safecast v1.8.1/go.mod h1:QqwNjxQ7DAqY0C721OIO9InMk9zCwcsO7tnRuHytad8=
 github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
diff --git a/internal/cast/cast.go b/internal/cast/cast.go
@@ -17,7 +17,7 @@ type number interface {
 }
 
 func SafeUint(x int) (uint, error) {
-	return safecast.ToUint(x)
+	return safecast.Convert[uint](x)
 }
 
 func Uint(x int) uint {
@@ -30,7 +30,7 @@ func Uint(x int) uint {
 }
 
 func SafeInt(x uint) (int, error) {
-	return safecast.ToInt(x)
+	return safecast.Convert[int](x)
 }
 
 func Int(x uint) int {
@@ -43,7 +43,7 @@ func Int(x uint) int {
 }
 
 func SafeInt64[T number](x T) (int64, error) {
-	return safecast.ToInt64(x)
+	return safecast.Convert[int64](x)
 }
 
 func Int64[T number](x T) int64 {
@@ -56,7 +56,7 @@ func Int64[T number](x T) int64 {
 }
 
 func SafeUint64[T signed](x T) (uint64, error) {
-	return safecast.ToUint64(x)
+	return safecast.Convert[uint64](x)
 }
 
 func Uint64[T signed](x T) uint64 {
@@ -69,7 +69,7 @@ func Uint64[T signed](x T) uint64 {
 }
 
 func SafeInt32[T signed](x T) (int32, error) {
-	return safecast.ToInt32(x)
+	return safecast.Convert[int32](x)
 }
 
 func Int32[T signed](x T) int32 {
@@ -82,7 +82,7 @@ func Int32[T signed](x T) int32 {
 }
 
 func SafeUint32[T number](x T) (uint32, error) {
-	return safecast.ToUint32(x)
+	return safecast.Convert[uint32](x)
 }
 
 func Uint32[T number](x T) uint32 {
@@ -95,7 +95,7 @@ func Uint32[T number](x T) uint32 {
 }
 
 func SafeUint8(x int) (uint8, error) {
-	return safecast.ToUint8(x)
+	return safecast.Convert[uint8](x)
 }
 
 func Uint8(x int) uint8 {
diff --git a/internal/sshutil/agent_unix.go b/internal/sshutil/agent_unix.go
@@ -1,5 +1,4 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sshutil
 
diff --git a/utils/sysutils/sysutils_unix.go b/utils/sysutils/sysutils_unix.go
@@ -1,5 +1,4 @@
 //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package sysutils
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build !windows`
`2`		`-// +build !windows`
`3`	`2`
`4`	`3`	`package eab`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build windows`
`2`		`-// +build windows`
`3`	`2`
`4`	`3`	`package eab`
`5`	`4`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type number interface {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`func SafeUint(x int) (uint, error) {`
`20`		`- return safecast.ToUint(x)`
	`20`	`+ return safecast.Convert[uint](x)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`func Uint(x int) uint {`
`@@ -30,7 +30,7 @@ func Uint(x int) uint {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func SafeInt(x uint) (int, error) {`
`33`		`- return safecast.ToInt(x)`
	`33`	`+ return safecast.Convert[int](x)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func Int(x uint) int {`
`@@ -43,7 +43,7 @@ func Int(x uint) int {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`func SafeInt64[T number](x T) (int64, error) {`
`46`		`- return safecast.ToInt64(x)`
	`46`	`+ return safecast.Convert[int64](x)`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func Int64[T number](x T) int64 {`
`@@ -56,7 +56,7 @@ func Int64[T number](x T) int64 {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func SafeUint64[T signed](x T) (uint64, error) {`
`59`		`- return safecast.ToUint64(x)`
	`59`	`+ return safecast.Convert[uint64](x)`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`func Uint64[T signed](x T) uint64 {`
`@@ -69,7 +69,7 @@ func Uint64[T signed](x T) uint64 {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`func SafeInt32[T signed](x T) (int32, error) {`
`72`		`- return safecast.ToInt32(x)`
	`72`	`+ return safecast.Convert[int32](x)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`func Int32[T signed](x T) int32 {`
`@@ -82,7 +82,7 @@ func Int32[T signed](x T) int32 {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`func SafeUint32[T number](x T) (uint32, error) {`
`85`		`- return safecast.ToUint32(x)`
	`85`	`+ return safecast.Convert[uint32](x)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`func Uint32[T number](x T) uint32 {`
`@@ -95,7 +95,7 @@ func Uint32[T number](x T) uint32 {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`func SafeUint8(x int) (uint8, error) {`
`98`		`- return safecast.ToUint8(x)`
	`98`	`+ return safecast.Convert[uint8](x)`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`func Uint8(x int) uint8 {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`//go:build aix \|\| darwin \|\| dragonfly \|\| freebsd \|\| linux \|\| netbsd \|\| openbsd \|\| solaris`
`2`		`-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris`
`3`	`2`
`4`	`3`	`package sshutil`
`5`	`4`