diff options
Diffstat (limited to 'format')
9 files changed, 12 insertions, 22 deletions
diff --git a/format/commitgraph/read/read_test.go b/format/commitgraph/read/read_test.go index 234ece6b..bd2abd3d 100644 --- a/format/commitgraph/read/read_test.go +++ b/format/commitgraph/read/read_test.go @@ -159,8 +159,8 @@ func TestBloomUnavailableWithoutChangedPaths(t *testing.T) { t.Fatal("BloomFilterAt() error = nil, want BloomUnavailableError") } - var unavailable *read.BloomUnavailableError - if !errors.As(err, &unavailable) { + unavailable, ok := errors.AsType[*read.BloomUnavailableError](err) + if !ok { t.Fatalf("BloomFilterAt() error type = %T, want *BloomUnavailableError", err) } diff --git a/format/pack/ingest/ingest_test.go b/format/pack/ingest/ingest_test.go index 8f50b3d1..a40f9ad9 100644 --- a/format/pack/ingest/ingest_test.go +++ b/format/pack/ingest/ingest_test.go @@ -211,8 +211,7 @@ func TestIngestThinPackWithoutFixReturnsUnresolved(t *testing.T) { t.Fatal("Ingest error = nil, want error") } - var unresolved *ingest.ThinPackUnresolvedError - if !errors.As(err, &unresolved) { + if _, ok := errors.AsType[*ingest.ThinPackUnresolvedError](err); !ok { t.Fatalf("Ingest error type = %T (%v), want *ThinPackUnresolvedError", err, err) } @@ -282,8 +281,7 @@ func TestIngestPackTrailerMismatch(t *testing.T) { t.Fatal("Ingest error = nil, want error") } - var mismatch *ingest.PackTrailerMismatchError - if !errors.As(err, &mismatch) { + if _, ok := errors.AsType[*ingest.PackTrailerMismatchError](err); !ok { t.Fatalf("Ingest error type = %T (%v), want *PackTrailerMismatchError", err, err) } diff --git a/format/pktline/decoder_invalid_0003_test.go b/format/pktline/decoder_invalid_0003_test.go index adda99a3..3a93633c 100644 --- a/format/pktline/decoder_invalid_0003_test.go +++ b/format/pktline/decoder_invalid_0003_test.go @@ -14,8 +14,7 @@ func TestDecoderInvalid0003(t *testing.T) { dec := pktline.NewDecoder(strings.NewReader("0003"), pktline.ReadOptions{}) _, err := dec.ReadFrame() - var pe *pktline.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*pktline.ProtocolError](err); !ok { t.Fatalf("got err %v, want ProtocolError", err) } } diff --git a/format/pktline/decoder_rejects_over_maximum_length_test.go b/format/pktline/decoder_rejects_over_maximum_length_test.go index b6059446..8d897a55 100644 --- a/format/pktline/decoder_rejects_over_maximum_length_test.go +++ b/format/pktline/decoder_rejects_over_maximum_length_test.go @@ -16,8 +16,7 @@ func TestDecoderRejectsOverMaximumLength(t *testing.T) { _, err := dec.ReadFrame() - var pe *pktline.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*pktline.ProtocolError](err); !ok { t.Fatalf("got err %v, want ProtocolError", err) } } diff --git a/format/pktline/decoder_resync_after_over_wire_max_test.go b/format/pktline/decoder_resync_after_over_wire_max_test.go index 8f692f2d..29a3440f 100644 --- a/format/pktline/decoder_resync_after_over_wire_max_test.go +++ b/format/pktline/decoder_resync_after_over_wire_max_test.go @@ -22,8 +22,7 @@ func TestDecoderResyncAfterOverWireMax(t *testing.T) { _, err := dec.ReadFrame() - var pe *pktline.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*pktline.ProtocolError](err); !ok { t.Fatalf("got err %v, want ProtocolError", err) } diff --git a/format/sideband64k/decoder_invalid_band_test.go b/format/sideband64k/decoder_invalid_band_test.go index 5a58640c..12c53891 100644 --- a/format/sideband64k/decoder_invalid_band_test.go +++ b/format/sideband64k/decoder_invalid_band_test.go @@ -14,8 +14,7 @@ func TestDecoderInvalidBand(t *testing.T) { dec := sideband64k.NewDecoder(strings.NewReader("0005\x04"), sideband64k.ReadOptions{}) _, err := dec.ReadFrame() - var pe *sideband64k.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*sideband64k.ProtocolError](err); !ok { t.Fatalf("got err %v, want ProtocolError", err) } } diff --git a/format/sideband64k/decoder_invalid_empty_payload_test.go b/format/sideband64k/decoder_invalid_empty_payload_test.go index 679e28d3..eb52ad6a 100644 --- a/format/sideband64k/decoder_invalid_empty_payload_test.go +++ b/format/sideband64k/decoder_invalid_empty_payload_test.go @@ -14,8 +14,7 @@ func TestDecoderInvalidEmptyPayload(t *testing.T) { dec := sideband64k.NewDecoder(strings.NewReader("0004"), sideband64k.ReadOptions{}) _, err := dec.ReadFrame() - var pe *sideband64k.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*sideband64k.ProtocolError](err); !ok { t.Fatalf("got err %v, want ProtocolError", err) } } diff --git a/format/sideband64k/decoder_malformed_pktline_test.go b/format/sideband64k/decoder_malformed_pktline_test.go index ffa746ca..54ea6ffb 100644 --- a/format/sideband64k/decoder_malformed_pktline_test.go +++ b/format/sideband64k/decoder_malformed_pktline_test.go @@ -15,8 +15,7 @@ func TestDecoderInvalid0003(t *testing.T) { dec := sideband64k.NewDecoder(strings.NewReader("0003"), sideband64k.ReadOptions{}) _, err := dec.ReadFrame() - var pe *pktline.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*pktline.ProtocolError](err); !ok { t.Fatalf("got err %v, want pktline.ProtocolError", err) } } @@ -27,8 +26,7 @@ func TestDecoderRejectsOverMaximumLength(t *testing.T) { dec := sideband64k.NewDecoder(strings.NewReader("fffe"), sideband64k.ReadOptions{}) _, err := dec.ReadFrame() - var pe *pktline.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*pktline.ProtocolError](err); !ok { t.Fatalf("got err %v, want pktline.ProtocolError", err) } } diff --git a/format/sideband64k/decoder_resync_after_over_wire_max_test.go b/format/sideband64k/decoder_resync_after_over_wire_max_test.go index 09a8c459..c790cd6f 100644 --- a/format/sideband64k/decoder_resync_after_over_wire_max_test.go +++ b/format/sideband64k/decoder_resync_after_over_wire_max_test.go @@ -22,8 +22,7 @@ func TestDecoderResyncAfterOverWireMax(t *testing.T) { _, err := dec.ReadFrame() - var pe *pktline.ProtocolError - if !errors.As(err, &pe) { + if _, ok := errors.AsType[*pktline.ProtocolError](err); !ok { t.Fatalf("got err %v, want pktline.ProtocolError", err) } |