1
0
forked from rosa/hakurei

all: apply modernisers

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2026-06-08 14:19:11 +09:00
parent 725f2e0ef3
commit f869ff95a1
35 changed files with 146 additions and 141 deletions
+6 -5
View File
@@ -6,6 +6,7 @@ import (
"maps"
"reflect"
"slices"
"strings"
"unique"
)
@@ -107,8 +108,8 @@ func (e TypeError) Error() string {
}
func (e TypeError) Is(err error) bool {
var v TypeError
return errors.As(err, &v) &&
v, ok := errors.AsType[TypeError](err)
return ok &&
e.Asserted == v.Asserted &&
e.Concrete == v.Concrete
}
@@ -233,14 +234,14 @@ func evaluateAny(d PF, s []Frame, expr, rp any) bool {
return evaluateAny(d, s, e[0], rp)
}
}
var v string
var v strings.Builder
for i := range e {
var _r string
if evaluate(d, s, e[i], &_r) {
v += _r
v.WriteString(_r)
}
}
store(rp, v)
store(rp, v.String())
return true
case Array:
+1 -1
View File
@@ -214,7 +214,7 @@ func TestEvaluate(t *testing.T) {
}
var errEquals bool
if errors.As(err, new(TypeError)) {
if _, ok := errors.AsType[TypeError](err); ok {
errEquals = errors.Is(err, tc.err)
} else {
errEquals = reflect.DeepEqual(err, tc.err)