Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos in comments and field names #128

Merged
merged 1 commit into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion contexttags/contexttags.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
// WithContextTags captures the k/v pairs stored in the context via the
// `logtags` package and annotates them on the error.
//
// Only the stromg representation of values remains available. This is
// Only the strong representation of values remains available. This is
// because the library cannot guarantee that the underlying value is
// preserved across the network. To avoid creating a stateful interface
// (where the user code needs to know whether an error has traveled
Expand Down
2 changes: 1 addition & 1 deletion errutil/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

// Package errutil combines primitives from the library, the Go errors
// package and github.com/pkg/errors. It aims to serve as drop-in
// replacement to gitub.com/pkg/errors and replace the legacy
// replacement to github.com/pkg/errors and replace the legacy
// implementation of `pgerrors`.
package errutil
2 changes: 1 addition & 1 deletion exthttp/ext_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func (w *withHTTPCode) Unwrap() error { return w.cause }
func (w *withHTTPCode) Format(s fmt.State, verb rune) { errors.FormatError(w, s, verb) }

// SafeFormatter implements errors.SafeFormatter.
// Note: see the documentat ion of errbase.SafeFormatter for details
// Note: see the documentation of errbase.SafeFormatter for details
// on how to implement this. In particular beware of not emitting
// unsafe strings.
func (w *withHTTPCode) SafeFormatError(p errors.Printer) (next error) {
Expand Down
2 changes: 1 addition & 1 deletion fmttests/datadriven_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ var wrapCommands = map[string]commandFn{
"assertwrap": func(err error, args []arg) error {
return errutil.NewAssertionErrorWithWrappedErrf(err, "assertmsg: %s", strfy(args))
},
// barirer is a simpler barrier
// barrier is a simpler barrier
"barrier": func(err error, _ []arg) error { return barriers.Handled(err) },
// domains are hidden annotations. Tested here for sentry reporting.
"domain": func(err error, _ []arg) error { return domains.WithDomain(err, "mydomain") },
Expand Down
12 changes: 6 additions & 6 deletions markers/markers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -727,9 +727,9 @@ func (e *invalidError) Cause() error { return e.emptyRef }
func TestDelegateToIsMethod(t *testing.T) {
tt := testutils.T{T: t}

efoo := &errWithIs{msg: "foo", seecret: "foo"}
efoo2 := &errWithIs{msg: "foo", seecret: "bar"}
ebar := &errWithIs{msg: "bar", seecret: "foo"}
efoo := &errWithIs{msg: "foo", secret: "foo"}
efoo2 := &errWithIs{msg: "foo", secret: "bar"}
ebar := &errWithIs{msg: "bar", secret: "foo"}

tt.Check(markers.Is(efoo, efoo2)) // equality based on message
tt.Check(markers.Is(efoo, ebar)) // equality based on method
Expand All @@ -741,15 +741,15 @@ func TestDelegateToIsMethod(t *testing.T) {
}

type errWithIs struct {
msg string
seecret string
msg string
secret string
}

func (e *errWithIs) Error() string { return e.msg }

func (e *errWithIs) Is(o error) bool {
if ex, ok := o.(*errWithIs); ok {
return e.seecret == ex.seecret
return e.secret == ex.secret
}
return false
}
Expand Down