Skip to content

Commit bff157c

Browse files
committed
- Update go version dependency to go 1.24
- Update Panics() predicate to no longer consider special case for `panic(nil)` (see Go 1.21 panic behavior change)
1 parent be114a7 commit bff157c

File tree

4 files changed

+14
-21
lines changed

4 files changed

+14
-21
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/maargenton/go-testpredicate
22

3-
go 1.19
3+
go 1.24.0
44

5-
require golang.org/x/tools v0.22.0
5+
require golang.org/x/tools v0.34.0
66

77
require (
8-
golang.org/x/mod v0.18.0 // indirect
9-
golang.org/x/sync v0.7.0 // indirect
8+
golang.org/x/mod v0.26.0 // indirect
9+
golang.org/x/sync v0.16.0 // indirect
1010
)

go.sum

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
2-
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
3-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
4-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
5-
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
6-
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
1+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
3+
golang.org/x/mod v0.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
4+
golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
5+
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
6+
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
7+
golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
8+
golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=

pkg/utils/predicate/impl/panic.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@ func Panics() (desc string, f predicate.PredicateFunc) {
1919
"value of type '%v' is not callable",
2020
reflect.TypeOf(v))
2121
}
22-
panicked, recoveredValue := recoverWrapper(fct)
23-
if panicked && recoveredValue == nil {
24-
return false, nil, fmt.Errorf(
25-
"value() panicked with a nil value")
26-
}
27-
return panicked && recoveredValue != nil, nil, nil
22+
var panicked, _ = recoverWrapper(fct)
23+
return panicked, nil, nil
2824
}
2925
return
3026
}

pkg/utils/predicate/impl/panic_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ func TestPanic(t *testing.T) {
1515
value: func() {},
1616
pass: false,
1717
})
18-
verifyPredicate(t, pr(impl.Panics()), expectation{
19-
value: func() { panic(nil) },
20-
pass: false,
21-
errorMsg: "value() panicked with a nil value",
22-
})
2318
verifyPredicate(t, pr(impl.Panics()), expectation{
2419
value: 123,
2520
pass: false,

0 commit comments

Comments
 (0)