Skip to content

Commit 920c2a5

Browse files
committed
linting: use errors.As (errorlint)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent e2bac20 commit 920c2a5

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

connection.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ Loop:
356356
} else {
357357
debugMessage("(%p) EOF received", s)
358358
}
359-
if spdyErr, ok := err.(*spdy.Error); ok && spdyErr.Err == spdy.InvalidControlFrame {
359+
var spdyErr *spdy.Error
360+
if errors.As(err, &spdyErr) && spdyErr.Err == spdy.InvalidControlFrame {
360361
_ = s.conn.Close()
361362
}
362363
break

spdy/spdy_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,8 @@ func TestParseHeaderValueBlockRejectsHeaderCountOverLimit(t *testing.T) {
280280
if err == nil {
281281
t.Fatal("expected error for excessive header count")
282282
}
283-
spdyErr, ok := err.(*Error)
283+
var spdyErr *Error
284+
ok := errors.As(err, &spdyErr)
284285
if !ok || spdyErr.Err != InvalidControlFrame {
285286
t.Fatalf("unexpected error: %v", err)
286287
}
@@ -300,7 +301,8 @@ func TestParseHeaderValueBlockRejectsHeaderFieldSizeOverLimit(t *testing.T) {
300301
if err == nil {
301302
t.Fatal("expected error for excessive header field size")
302303
}
303-
spdyErr, ok := err.(*Error)
304+
var spdyErr *Error
305+
ok := errors.As(err, &spdyErr)
304306
if !ok || spdyErr.Err != InvalidControlFrame {
305307
t.Fatalf("unexpected error: %v", err)
306308
}
@@ -725,9 +727,9 @@ func checkZeroStreamId(t *testing.T, frame string, method string, err error) {
725727
t.Errorf("%s ZeroStreamId, no error on %s", method, frame)
726728
return
727729
}
728-
eerr := &Error{}
729-
ok := errors.As(err, &eerr)
730-
if !ok || eerr.Err != ZeroStreamId {
731-
t.Errorf("%s ZeroStreamId, incorrect error %#v, frame %s", method, eerr, frame)
730+
var spdyErr *Error
731+
ok := errors.As(err, &spdyErr)
732+
if !ok || spdyErr.Err != ZeroStreamId {
733+
t.Errorf("%s ZeroStreamId, incorrect error %#v, frame %s", method, spdyErr, frame)
732734
}
733735
}

0 commit comments

Comments
 (0)