From e543fbc80ef16c8e803954c33d062086552e8109 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 21 Jun 2024 18:36:58 +0000 Subject: [PATCH] update remaining gruf libraries relying on linkname (#3028) --- go.mod | 4 +- go.sum | 8 +-- .../codeberg.org/gruf/go-bytesize/bytesize.go | 39 +++++++---- .../gruf/go-errors/v2/standard.go | 70 +++---------------- vendor/modules.txt | 4 +- 5 files changed, 42 insertions(+), 83 deletions(-) diff --git a/go.mod b/go.mod index 558a0b90b..1d78b0700 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,11 @@ replace modernc.org/sqlite => gitlab.com/NyaaaWhatsUpDoc/sqlite v1.29.9-concurre require ( codeberg.org/gruf/go-bytes v1.0.2 - codeberg.org/gruf/go-bytesize v1.0.2 + codeberg.org/gruf/go-bytesize v1.0.3 codeberg.org/gruf/go-byteutil v1.2.0 codeberg.org/gruf/go-cache/v3 v3.5.7 codeberg.org/gruf/go-debug v1.3.0 - codeberg.org/gruf/go-errors/v2 v2.3.1 + codeberg.org/gruf/go-errors/v2 v2.3.2 codeberg.org/gruf/go-fastcopy v1.1.2 codeberg.org/gruf/go-iotools v0.0.0-20230811115124-5d4223615a7f codeberg.org/gruf/go-kv v1.6.4 diff --git a/go.sum b/go.sum index 77ecb3099..d87b9a721 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ codeberg.org/gruf/go-bitutil v1.1.0 h1:U1Q+A1mtnPk+npqYrlRBc9ar2C5hYiBd17l1Wrp2B codeberg.org/gruf/go-bitutil v1.1.0/go.mod h1:rGibFevYTQfYKcPv0Df5KpG8n5xC3AfD4d/UgYeoNy0= codeberg.org/gruf/go-bytes v1.0.2 h1:malqE42Ni+h1nnYWBUAJaDDtEzF4aeN4uPN8DfMNNvo= codeberg.org/gruf/go-bytes v1.0.2/go.mod h1:1v/ibfaosfXSZtRdW2rWaVrDXMc9E3bsi/M9Ekx39cg= -codeberg.org/gruf/go-bytesize v1.0.2 h1:Mo+ITi+0uZ4YNSZf2ed6Qw8acOI39W4mmgE1a8lslXw= -codeberg.org/gruf/go-bytesize v1.0.2/go.mod h1:n/GU8HzL9f3UNp/mUKyr1qVmTlj7+xacpp0OHfkvLPs= +codeberg.org/gruf/go-bytesize v1.0.3 h1:Tz8tCxhPLeyM5VryuBNjUHgKmLj4Bx9RbPaUSA3qg6g= +codeberg.org/gruf/go-bytesize v1.0.3/go.mod h1:n/GU8HzL9f3UNp/mUKyr1qVmTlj7+xacpp0OHfkvLPs= codeberg.org/gruf/go-byteutil v1.2.0 h1:YoxkpUOoHS82BcPXfiIcWLe/YhS8QhpNUHdfuhN09QM= codeberg.org/gruf/go-byteutil v1.2.0/go.mod h1:cWM3tgMCroSzqoBXUXMhvxTxYJp+TbCr6ioISRY5vSU= codeberg.org/gruf/go-cache/v3 v3.5.7 h1:5hut49a8Wp3hdwrCEJYj6pHY2aRR1hyTmkK4+wHVYq4= @@ -46,8 +46,8 @@ codeberg.org/gruf/go-cache/v3 v3.5.7/go.mod h1:Thahfuf3PgHSv2+1zHpvhRdX97tx1WXur codeberg.org/gruf/go-debug v1.3.0 h1:PIRxQiWUFKtGOGZFdZ3Y0pqyfI0Xr87j224IYe2snZs= codeberg.org/gruf/go-debug v1.3.0/go.mod h1:N+vSy9uJBQgpQcJUqjctvqFz7tBHJf+S/PIjLILzpLg= codeberg.org/gruf/go-errors/v2 v2.0.0/go.mod h1:ZRhbdhvgoUA3Yw6e56kd9Ox984RrvbEFC2pOXyHDJP4= -codeberg.org/gruf/go-errors/v2 v2.3.1 h1:5+OChx06R8HT+OFB3KFetPdaptQYBS9XVZKKf30wIbk= -codeberg.org/gruf/go-errors/v2 v2.3.1/go.mod h1:LfzD9nkAAJpEDbkUqOZQ2jdaQ8VrK0pnR36zLOMFq6Y= +codeberg.org/gruf/go-errors/v2 v2.3.2 h1:8ItWaOMfhDaqrJK1Pw8MO0Nu+o/tVcQtR5cJ58Vc4zo= +codeberg.org/gruf/go-errors/v2 v2.3.2/go.mod h1:LfzD9nkAAJpEDbkUqOZQ2jdaQ8VrK0pnR36zLOMFq6Y= codeberg.org/gruf/go-fastcopy v1.1.2 h1:YwmYXPsyOcRBxKEE2+w1bGAZfclHVaPijFsOVOcnNcw= codeberg.org/gruf/go-fastcopy v1.1.2/go.mod h1:GDDYR0Cnb3U/AIfGM3983V/L+GN+vuwVMvrmVABo21s= codeberg.org/gruf/go-fastpath/v2 v2.0.0 h1:iAS9GZahFhyWEH0KLhFEJR+txx1ZhMXxYzu2q5Qo9c0= diff --git a/vendor/codeberg.org/gruf/go-bytesize/bytesize.go b/vendor/codeberg.org/gruf/go-bytesize/bytesize.go index 939397939..d24ff5f0f 100644 --- a/vendor/codeberg.org/gruf/go-bytesize/bytesize.go +++ b/vendor/codeberg.org/gruf/go-bytesize/bytesize.go @@ -3,7 +3,7 @@ package bytesize import ( "errors" "math/bits" - _ "strconv" + "strconv" "unsafe" ) @@ -102,10 +102,10 @@ func ParseSize(s string) (Size, error) { return 0, err } - // Parse remaining string as float - f, n, err := atof64(s[:l]) - if err != nil || n != l { - return 0, ErrInvalidFormat + // Parse remaining string as 64bit float + f, err := strconv.ParseFloat(s[:l], 64) + if err != nil { + return 0, errctx(ErrInvalidFormat, err.Error()) } return Size(f * unit), nil @@ -236,7 +236,7 @@ func parseUnit(s string) (float64, int, error) { // Check valid unit char was provided if len(iecvals) < c || iecvals[c] == 0 { - return 0, 0, ErrInvalidUnit + return 0, 0, errctx(ErrInvalidUnit, s[l:]) } // Return parsed IEC unit size @@ -250,7 +250,7 @@ func parseUnit(s string) (float64, int, error) { switch { // Check valid unit char provided case len(sivals) < c || sivals[c] == 0: - return 0, 0, ErrInvalidUnit + return 0, 0, errctx(ErrInvalidUnit, s[l:]) // No unit char (only ascii number) case sivals[c] == 1: @@ -349,10 +349,21 @@ func itoa(dst []byte, i uint64) []byte { return append(dst, b[bp:]...) } -// We use the following internal strconv function usually -// used internally to parse float values, as we know that -// are value passed will always be of 64bit type, and knowing -// the returned float string length is very helpful! -// -//go:linkname atof64 strconv.atof64 -func atof64(string) (float64, int, error) +// errwithctx wraps an error +// with extra context info. +type errwithctx struct { + err error + ctx string +} + +func errctx(err error, ctx string) error { + return &errwithctx{err: err, ctx: ctx} +} + +func (err *errwithctx) Unwrap() error { + return err.err +} + +func (err *errwithctx) Error() string { + return err.err.Error() + ": " + err.ctx +} diff --git a/vendor/codeberg.org/gruf/go-errors/v2/standard.go b/vendor/codeberg.org/gruf/go-errors/v2/standard.go index 3739416dc..e1d7d1440 100644 --- a/vendor/codeberg.org/gruf/go-errors/v2/standard.go +++ b/vendor/codeberg.org/gruf/go-errors/v2/standard.go @@ -1,29 +1,11 @@ package errors import ( - _ "unsafe" + "errors" ) -// Is reports whether any error in err's tree matches target. -// -// The tree consists of err itself, followed by the errors obtained by repeatedly -// calling Unwrap. When err wraps multiple errors, Is examines err followed by a -// depth-first traversal of its children. -// -// An error is considered to match a target if it is equal to that target or if -// it implements a method Is(error) bool such that Is(target) returns true. -// -// An error type might provide an Is method so it can be treated as equivalent -// to an existing error. For example, if MyError defines -// -// func (m MyError) Is(target error) bool { return target == fs.ErrExist } -// -// then Is(MyError{}, fs.ErrExist) returns true. See [syscall.Errno.Is] for -// an example in the standard library. An Is method should only shallowly -// compare err and the target and not call Unwrap on either. -// -//go:linkname Is errors.Is -func Is(err error, target error) bool +// See: errors.Is(). +func Is(err error, target error) bool { return errors.Is(err, target) } // IsV2 calls Is(err, target) for each target within targets. func IsV2(err error, targets ...error) bool { @@ -35,26 +17,8 @@ func IsV2(err error, targets ...error) bool { return false } -// As finds the first error in err's tree that matches target, and if one is found, sets -// target to that error value and returns true. Otherwise, it returns false. -// -// The tree consists of err itself, followed by the errors obtained by repeatedly -// calling Unwrap. When err wraps multiple errors, As examines err followed by a -// depth-first traversal of its children. -// -// An error matches target if the error's concrete value is assignable to the value -// pointed to by target, or if the error has a method As(interface{}) bool such that -// As(target) returns true. In the latter case, the As method is responsible for -// setting target. -// -// An error type might provide an As method so it can be treated as if it were a -// different error type. -// -// As panics if target is not a non-nil pointer to either a type that implements -// error, or to any interface type. -// -//go:linkname As errors.As -func As(err error, target any) bool +// See: errors.As(). +func As(err error, target any) bool { return errors.As(err, target) } // AsV2 is functionally similar to As(), instead // leveraging generics to handle allocation and @@ -97,15 +61,8 @@ func AsV2[Type any](err error) Type { return t } -// Unwrap returns the result of calling the Unwrap method on err, if err's -// type contains an Unwrap method returning error. -// Otherwise, Unwrap returns nil. -// -// Unwrap only calls a method of the form "Unwrap() error". -// In particular Unwrap does not unwrap errors returned by [Join]. -// -//go:linkname Unwrap errors.Unwrap -func Unwrap(err error) error +// See: errors.Unwrap(). +func Unwrap(err error) error { return errors.Unwrap(err) } // UnwrapV2 is functionally similar to Unwrap(), except that // it also handles the case of interface{ Unwrap() []error }. @@ -121,14 +78,5 @@ func UnwrapV2(err error) []error { return nil } -// Join returns an error that wraps the given errors. -// Any nil error values are discarded. -// Join returns nil if every value in errs is nil. -// The error formats as the concatenation of the strings obtained -// by calling the Error method of each element of errs, with a newline -// between each string. -// -// A non-nil error returned by Join implements the Unwrap() []error method. -// -//go:linkname Join errors.Join -func Join(errs ...error) error +// See: errors.Join(). +func Join(errs ...error) error { return errors.Join(errs...) } diff --git a/vendor/modules.txt b/vendor/modules.txt index d68be6db7..94157fa66 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -7,7 +7,7 @@ codeberg.org/gruf/go-bitutil # codeberg.org/gruf/go-bytes v1.0.2 ## explicit; go 1.14 codeberg.org/gruf/go-bytes -# codeberg.org/gruf/go-bytesize v1.0.2 +# codeberg.org/gruf/go-bytesize v1.0.3 ## explicit; go 1.17 codeberg.org/gruf/go-bytesize # codeberg.org/gruf/go-byteutil v1.2.0 @@ -21,7 +21,7 @@ codeberg.org/gruf/go-cache/v3/ttl # codeberg.org/gruf/go-debug v1.3.0 ## explicit; go 1.16 codeberg.org/gruf/go-debug -# codeberg.org/gruf/go-errors/v2 v2.3.1 +# codeberg.org/gruf/go-errors/v2 v2.3.2 ## explicit; go 1.19 codeberg.org/gruf/go-errors/v2 # codeberg.org/gruf/go-fastcopy v1.1.2