Rollback pkg/errors portion of #298 #299
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dcormier
reviewed
Aug 16, 2023
| @@ -462,15 +463,15 @@ func TestBoundaryReaderReadErrors(t *testing.T) { | |||
| if n != 0 { | |||
| t.Fatal("Read() should not have read any bytes, failed") | |||
| } | |||
| if !errors.Is(err, bufio.ErrBufferFull) { | |||
| if errors.Cause(err) != bufio.ErrBufferFull { | |||
There was a problem hiding this comment.
errors.Is() is probably better here, ultimately.
| t.Fatal("Read() should have returned bufio.ErrBufferFull error, failed") | ||
| } | ||
| // Next method to return a non io.EOF error. | ||
| next, err := br.Next() | ||
| if next { | ||
| t.Fatal("Next() should have returned false, failed") | ||
| } | ||
| if !errors.Is(err, bufio.ErrBufferFull) { | ||
| if errors.Cause(err) != bufio.ErrBufferFull { |
There was a problem hiding this comment.
errors.Is() is probably better here, ultimately.
Comment on lines
+43
to
+46
| switch errors.Cause(err) { | ||
| case nil, io.EOF: | ||
| // carry on, io.EOF is expected | ||
| default: |
There was a problem hiding this comment.
The previous logic, using errors.Is(), is probably better here.
Comment on lines
327
to
334
| func IsBase64CorruptInputError(err error) bool { | ||
| if err == nil { | ||
| switch errors.Cause(err).(type) { | ||
| case base64.CorruptInputError: | ||
| return true | ||
| default: | ||
| return false | ||
| } | ||
| _, ok := err.(base64.CorruptInputError) | ||
| return ok | ||
| } |
There was a problem hiding this comment.
func IsBase64CorruptInputError(err error) bool {
var errCorrupt base64.CorruptInputError
return errors.As(err, &errCorrupt)
}| @@ -406,7 +407,7 @@ func parseParts(parent *Part, reader *bufio.Reader) error { | |||
| br := newBoundaryReader(reader, parent.Boundary) | |||
| for indexPartID := 1; true; indexPartID++ { | |||
| next, err := br.Next() | |||
| if err != nil && !errors.Is(err, io.EOF) { | |||
| if err != nil && errors.Cause(err) != io.EOF { | |||
There was a problem hiding this comment.
!errors.Is(io.EOF) is probably better here, ultimately.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR #298 removed usage of the archived package github.com/pkg/errors, and
references to the deprecated ioutil package.
After understanding that stdlib errors still does not support stack trace
wrapping (see discussion in #298), we have decided to rollback these changes
as parser debugging heavily benefits from stack traces.
The ioutil changes are desirable and will be kept.
See also #94