diff --git a/barriers/barriers.go b/barriers/barriers.go index 7e6d6f7..b0fd33f 100644 --- a/barriers/barriers.go +++ b/barriers/barriers.go @@ -37,7 +37,7 @@ func Handled(err error) error { if err == nil { return nil } - return HandledWithMessage(err, err.Error()) + return HandledWithSafeMessage(err, redact.Sprint(err)) } // HandledWithMessage is like Handled except the message is overridden. @@ -47,7 +47,14 @@ func HandledWithMessage(err error, msg string) error { if err == nil { return nil } - return &barrierError{maskedErr: err, msg: msg} + return HandledWithSafeMessage(err, redact.Sprint(msg)) +} + +// HandledWithSafeMessage is like Handled except the message is overridden. +// This can be used e.g. to hide message details or to prevent +// downstream code to make assertions on the message's contents. +func HandledWithSafeMessage(err error, msg redact.RedactableString) error { + return &barrierErr{maskedErr: err, smsg: msg} } // HandledWithMessagef is like HandledWithMessagef except the message @@ -56,34 +63,34 @@ func HandledWithMessagef(err error, format string, args ...interface{}) error { if err == nil { return nil } - return &barrierError{maskedErr: err, msg: fmt.Sprintf(format, args...)} + return &barrierErr{maskedErr: err, smsg: redact.Sprintf(format, args...)} } -// barrierError is a leaf error type. It encapsulates a chain of +// barrierErr is a leaf error type. It encapsulates a chain of // original causes, but these causes are hidden so that they inhibit // matching via Is() and the Cause()/Unwrap() recursions. -type barrierError struct { +type barrierErr struct { // Message for the barrier itself. // In the common case, the message from the masked error // is used as-is (see Handled() above) however it is // useful to cache it here since the masked error may // have a long chain of wrappers and its Error() call // may be expensive. - msg string + smsg redact.RedactableString // Masked error chain. maskedErr error } -var _ error = (*barrierError)(nil) -var _ errbase.SafeDetailer = (*barrierError)(nil) -var _ errbase.SafeFormatter = (*barrierError)(nil) -var _ fmt.Formatter = (*barrierError)(nil) +var _ error = (*barrierErr)(nil) +var _ errbase.SafeDetailer = (*barrierErr)(nil) +var _ errbase.SafeFormatter = (*barrierErr)(nil) +var _ fmt.Formatter = (*barrierErr)(nil) -// barrierError is an error. -func (e *barrierError) Error() string { return e.msg } +// barrierErr is an error. +func (e *barrierErr) Error() string { return e.smsg.StripMarkers() } // SafeDetails reports the PII-free details from the masked error. -func (e *barrierError) SafeDetails() []string { +func (e *barrierErr) SafeDetails() []string { var details []string for err := e.maskedErr; err != nil; err = errbase.UnwrapOnce(err) { sd := errbase.GetSafeDetails(err) @@ -94,10 +101,10 @@ func (e *barrierError) SafeDetails() []string { } // Printing a barrier reveals the details. -func (e *barrierError) Format(s fmt.State, verb rune) { errbase.FormatError(e, s, verb) } +func (e *barrierErr) Format(s fmt.State, verb rune) { errbase.FormatError(e, s, verb) } -func (e *barrierError) SafeFormatError(p errbase.Printer) (next error) { - p.Print(e.msg) +func (e *barrierErr) SafeFormatError(p errbase.Printer) (next error) { + p.Print(e.smsg) if p.Detail() { p.Printf("-- cause hidden behind barrier\n%+v", e.maskedErr) } @@ -108,19 +115,37 @@ func (e *barrierError) SafeFormatError(p errbase.Printer) (next error) { func encodeBarrier( ctx context.Context, err error, ) (msg string, details []string, payload proto.Message) { - e := err.(*barrierError) + e := err.(*barrierErr) enc := errbase.EncodeError(ctx, e.maskedErr) - return e.msg, e.SafeDetails(), &enc + return string(e.smsg), e.SafeDetails(), &enc } // A barrier error is decoded exactly. func decodeBarrier(ctx context.Context, msg string, _ []string, payload proto.Message) error { enc := payload.(*errbase.EncodedError) - return &barrierError{msg: msg, maskedErr: errbase.DecodeError(ctx, *enc)} + return &barrierErr{smsg: redact.RedactableString(msg), maskedErr: errbase.DecodeError(ctx, *enc)} } +// Previous versions of barrier errors. +func decodeBarrierPrev(ctx context.Context, msg string, _ []string, payload proto.Message) error { + enc := payload.(*errbase.EncodedError) + return &barrierErr{smsg: redact.Sprint(msg), maskedErr: errbase.DecodeError(ctx, *enc)} +} + +// barrierErr is the "old" type nane of barrierErr. We use a new +// name now to ensure a different decode function is used when +// importing barriers from the previous structure, where the +// message is not redactable. +type barrierError struct { + msg string + maskedErr error +} + +func (b *barrierError) Error() string { return "" } + func init() { - tn := errbase.GetTypeKey((*barrierError)(nil)) + errbase.RegisterLeafDecoder(errbase.GetTypeKey((*barrierError)(nil)), decodeBarrierPrev) + tn := errbase.GetTypeKey((*barrierErr)(nil)) errbase.RegisterLeafDecoder(tn, decodeBarrier) errbase.RegisterLeafEncoder(tn, encodeBarrier) } diff --git a/barriers/barriers_test.go b/barriers/barriers_test.go index c92a168..b559161 100644 --- a/barriers/barriers_test.go +++ b/barriers/barriers_test.go @@ -118,7 +118,7 @@ woo | woo | (1) woo | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError`}, +Error types: (1) *barriers.barrierErr`}, {"handled + handled", barriers.Handled(barriers.Handled(goErr.New("woo"))), woo, ` woo @@ -130,8 +130,8 @@ woo | | woo | | (1) woo | | Error types: (1) *errors.errorString - | Error types: (1) *barriers.barrierError -Error types: (1) *barriers.barrierError`}, + | Error types: (1) *barriers.barrierErr +Error types: (1) *barriers.barrierErr`}, {"handledmsg", barriers.HandledWithMessage(goErr.New("woo"), "waa"), "waa", ` waa @@ -140,7 +140,7 @@ waa | woo | (1) woo | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError`}, +Error types: (1) *barriers.barrierErr`}, {"handledmsg + handledmsg", barriers.HandledWithMessage( barriers.HandledWithMessage( @@ -154,8 +154,8 @@ wuu | | woo | | (1) woo | | Error types: (1) *errors.errorString - | Error types: (1) *barriers.barrierError -Error types: (1) *barriers.barrierError`}, + | Error types: (1) *barriers.barrierErr +Error types: (1) *barriers.barrierErr`}, {"handled + wrapper", barriers.Handled( @@ -172,7 +172,7 @@ waa: woo | | multi-line wrapper payload | Wraps: (2) woo | Error types: (1) *barriers_test.werrFmt (2) *errors.errorString -Error types: (1) *barriers.barrierError`}, +Error types: (1) *barriers.barrierErr`}, } for _, test := range testCases { diff --git a/errutil/message_test.go b/errutil/message_test.go index 34bb2d1..0a7311d 100644 --- a/errutil/message_test.go +++ b/errutil/message_test.go @@ -124,7 +124,7 @@ Wraps: (4) wuu: woo | | multi-line payload | Wraps: (2) woo | Error types: (1) *errutil_test.werrFmt (2) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError`, +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr`, }, {"assert + wrap empty", @@ -148,7 +148,7 @@ Wraps: (3) wuu: woo | | multi-line payload | Wraps: (2) woo | Error types: (1) *errutil_test.werrFmt (2) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError`, +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr`, }, {"assert + wrap empty+arg", @@ -173,7 +173,7 @@ Wraps: (4) wuu: woo | | multi-line payload | Wraps: (2) woo | Error types: (1) *errutil_test.werrFmt (2) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError`, +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr`, }, } diff --git a/fmttests/testdata/format/wrap-fmt b/fmttests/testdata/format/wrap-fmt index 4aca287..7e74c24 100644 --- a/fmttests/testdata/format/wrap-fmt +++ b/fmttests/testdata/format/wrap-fmt @@ -6,8 +6,8 @@ require (?s) ---- &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, }, stack: &stack{...}, @@ -19,8 +19,8 @@ require (?s) == %#v &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, }, stack: &stack{...}, @@ -73,7 +73,7 @@ Wraps: (3) innerone | | innertwo's | | multi-line leaf payload | Error types: (1) *fmttests.errFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -129,7 +129,7 @@ Wraps: (3) ‹innerone› | ‹ | innertwo's› | ‹ | multi-line leaf payload› | Error types: (1) *fmttests.errFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -172,18 +172,18 @@ Wraps: (3) × | × | × | Error types: (1) *fmttests.errFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -218,8 +218,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -234,8 +234,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -293,7 +293,7 @@ Wraps: (4) innerone | | innertwo's | | multi-line leaf payload | Error types: (1) *fmttests.errFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -352,7 +352,7 @@ Wraps: (4) ‹innerone› | ‹ | innertwo's› | ‹ | multi-line leaf payload› | Error types: (1) *fmttests.errFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -397,20 +397,20 @@ Wraps: (4) × | × | × | Error types: (1) *fmttests.errFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -442,16 +442,16 @@ barrier outerthree outerfour require (?s) ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, } ===== ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, } == Error() @@ -474,7 +474,7 @@ innerone | | innertwo's | | multi-line leaf payload | Error types: (1) *fmttests.errFmt -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -503,7 +503,7 @@ Error types: (1) *barriers.barrierError | ‹ | innertwo's› | ‹ | multi-line leaf payload› | Error types: (1) *fmttests.errFmt -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -519,13 +519,13 @@ Error types: (1) *barriers.barrierError | × | × | Error types: (1) *fmttests.errFmt -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -1609,8 +1609,8 @@ handled-domain outerthree outerfour require (?s) ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1620,8 +1620,8 @@ require (?s) ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errFmt{msg:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1647,7 +1647,7 @@ Wraps: (2) innerone | | innertwo's | | multi-line leaf payload | Error types: (1) *fmttests.errFmt -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -1677,7 +1677,7 @@ Wraps: (2) ‹innerone› | ‹ | innertwo's› | ‹ | multi-line leaf payload› | Error types: (1) *fmttests.errFmt -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -1694,15 +1694,15 @@ Wraps: (2) × | × | × | Error types: (1) *fmttests.errFmt -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-fmt-via-network b/fmttests/testdata/format/wrap-fmt-via-network index f581b68..30635c8 100644 --- a/fmttests/testdata/format/wrap-fmt-via-network +++ b/fmttests/testdata/format/wrap-fmt-via-network @@ -7,8 +7,8 @@ require (?s)innerone.*innertwo ---- &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -34,8 +34,8 @@ require (?s)innerone.*innertwo == %#v &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -105,7 +105,7 @@ Wraps: (3) innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -164,7 +164,7 @@ Wraps: (3) ‹innerone› | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -210,18 +210,18 @@ Wraps: (3) × | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -257,8 +257,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -287,8 +287,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -363,7 +363,7 @@ Wraps: (4) innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -425,7 +425,7 @@ Wraps: (4) ‹innerone› | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -473,20 +473,20 @@ Wraps: (4) × | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -519,8 +519,8 @@ opaque require (?s)innerone.*innertwo ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -535,8 +535,8 @@ require (?s)innerone.*innertwo ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -567,7 +567,7 @@ innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -596,7 +596,7 @@ Error types: (1) *barriers.barrierError | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -612,13 +612,13 @@ Error types: (1) *barriers.barrierError | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -2055,8 +2055,8 @@ opaque require (?s)innerone.*innertwo ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -2074,8 +2074,8 @@ require (?s)innerone.*innertwo ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -2109,7 +2109,7 @@ Wraps: (2) innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -2139,7 +2139,7 @@ Wraps: (2) ‹innerone› | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -2156,15 +2156,15 @@ Wraps: (2) × | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-goerr b/fmttests/testdata/format/wrap-goerr index 29e3d2b..79388da 100644 --- a/fmttests/testdata/format/wrap-goerr +++ b/fmttests/testdata/format/wrap-goerr @@ -6,8 +6,8 @@ require (?s) ---- &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, stack: &stack{...}, @@ -19,8 +19,8 @@ require (?s) == %#v &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, stack: &stack{...}, @@ -70,7 +70,7 @@ Wraps: (3) innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -123,7 +123,7 @@ Wraps: (3) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -163,18 +163,18 @@ Wraps: (3) × | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -209,8 +209,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -225,8 +225,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -281,7 +281,7 @@ Wraps: (4) innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -337,7 +337,7 @@ Wraps: (4) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -379,20 +379,20 @@ Wraps: (4) × | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -424,16 +424,16 @@ barrier outerthree outerfour require (?s) ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, } ===== ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, } == Error() @@ -453,7 +453,7 @@ innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -479,7 +479,7 @@ Error types: (1) *barriers.barrierError | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -492,13 +492,13 @@ Error types: (1) *barriers.barrierError | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -1464,8 +1464,8 @@ handled-domain outerthree outerfour require (?s) ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1475,8 +1475,8 @@ require (?s) ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1499,7 +1499,7 @@ Wraps: (2) innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -1526,7 +1526,7 @@ Wraps: (2) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -1540,15 +1540,15 @@ Wraps: (2) × | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-goerr-via-network b/fmttests/testdata/format/wrap-goerr-via-network index 1a2983b..131e23a 100644 --- a/fmttests/testdata/format/wrap-goerr-via-network +++ b/fmttests/testdata/format/wrap-goerr-via-network @@ -7,8 +7,8 @@ require (?s)innerone.*innertwo ---- &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, prefix: "", @@ -26,8 +26,8 @@ require (?s)innerone.*innertwo == %#v &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, prefix: "", @@ -86,7 +86,7 @@ Wraps: (3) innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -142,7 +142,7 @@ Wraps: (3) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -185,18 +185,18 @@ Wraps: (3) × | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -232,8 +232,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -254,8 +254,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -319,7 +319,7 @@ Wraps: (4) innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -378,7 +378,7 @@ Wraps: (4) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -423,20 +423,20 @@ Wraps: (4) × | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -469,16 +469,16 @@ opaque require (?s)innerone.*innertwo ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, } ===== ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, } == Error() @@ -498,7 +498,7 @@ innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -524,7 +524,7 @@ Error types: (1) *barriers.barrierError | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -537,13 +537,13 @@ Error types: (1) *barriers.barrierError | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -1680,8 +1680,8 @@ opaque require (?s)innerone.*innertwo ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1691,8 +1691,8 @@ require (?s)innerone.*innertwo ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.errorString{s:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1715,7 +1715,7 @@ Wraps: (2) innerone | (1) innerone | | innertwo | Error types: (1) *errors.errorString -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -1742,7 +1742,7 @@ Wraps: (2) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *errors.errorString -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -1756,15 +1756,15 @@ Wraps: (2) × | (1) ×× | × | Error types: (1) *errors.errorString -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-newf b/fmttests/testdata/format/wrap-newf index 583b287..560f995 100644 --- a/fmttests/testdata/format/wrap-newf +++ b/fmttests/testdata/format/wrap-newf @@ -6,8 +6,8 @@ require (?s) ---- &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -22,8 +22,8 @@ require (?s) == %#v &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -102,7 +102,7 @@ Wraps: (3) new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -112,7 +112,7 @@ Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barr ===== redactable formats ===== == printed via redact Print(), ok - congruent with %v -‹new-style innerone› +new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -120,7 +120,7 @@ Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barr == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -‹new-style innerone› +new-style ‹innerone› (1) assertion failure Wraps: (2) attached stack trace -- stack trace: @@ -148,7 +148,7 @@ Wraps: (2) attached stack trace | : | runtime.goexit | : -Wraps: (3) ‹new-style innerone› +Wraps: (3) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -181,12 +181,12 @@ Wraps: (3) ‹new-style innerone› | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -:: × +:: new-style × (1) assertion failure Wraps: (2) attached stack trace -- stack trace: @@ -214,7 +214,7 @@ Wraps: (2) attached stack trace | : | runtime.goexit | : -Wraps: (3) × +Wraps: (3) new-style × | × | -- cause hidden behind barrier | new-style × @@ -247,18 +247,18 @@ Wraps: (3) × | Wraps: (2) new-style × | | × | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: new-style ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -293,8 +293,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -312,8 +312,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -397,7 +397,7 @@ Wraps: (4) new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -408,7 +408,7 @@ Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *erru ===== == printed via redact Print(), ok - congruent with %v assertmsg: ‹outerthree› -‹outerfour›: ‹new-style innerone› +‹outerfour›: new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -416,7 +416,7 @@ assertmsg: ‹outerthree› == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -assertmsg: ‹outerthree›: ‹new-style innerone› +assertmsg: ‹outerthree›: new-style ‹innerone› (1) assertion failure Wraps: (2) attached stack trace -- stack trace: @@ -446,7 +446,7 @@ Wraps: (2) attached stack trace | : Wraps: (3) assertmsg: ‹outerthree› | ‹outerfour› -Wraps: (4) ‹new-style innerone› +Wraps: (4) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -479,12 +479,12 @@ Wraps: (4) ‹new-style innerone› | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -:: assertmsg: ×: × +:: assertmsg: ×: new-style × (1) assertion failure Wraps: (2) attached stack trace -- stack trace: @@ -514,7 +514,7 @@ Wraps: (2) attached stack trace | : Wraps: (3) assertmsg: × | × -Wraps: (4) × +Wraps: (4) new-style × | × | -- cause hidden behind barrier | new-style × @@ -547,20 +547,20 @@ Wraps: (4) × | Wraps: (2) new-style × | | × | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: new-style ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -592,8 +592,8 @@ barrier outerthree outerfour require (?s) ---- -&barriers.barrierError{ - msg: "new-style innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -603,8 +603,8 @@ require (?s) ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "new-style innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -653,7 +653,7 @@ new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -663,7 +663,7 @@ Error types: (1) *barriers.barrierError ===== redactable formats ===== == printed via redact Print(), ok - congruent with %v -‹new-style innerone› +new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -671,8 +671,8 @@ Error types: (1) *barriers.barrierError == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -‹new-style innerone› -(1) ‹new-style innerone› +new-style ‹innerone› +(1) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -705,13 +705,13 @@ Error types: (1) *barriers.barrierError | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -× -(1) × +new-style × +(1) new-style × | × | -- cause hidden behind barrier | new-style × @@ -744,14 +744,14 @@ Error types: (1) *barriers.barrierError | Wraps: (2) new-style × | | × | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" -Title: "×" +Type: "*barriers.barrierErr" +Title: "new-style ×" (NO STACKTRACE) run @@ -3080,8 +3080,8 @@ handled-domain outerthree outerfour require (?s) ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -3094,8 +3094,8 @@ require (?s) ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &withstack.withStack{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, stack: &stack{...}, @@ -3147,7 +3147,7 @@ Wraps: (2) new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -3157,7 +3157,7 @@ Error types: (1) *domains.withDomain (2) *barriers.barrierError ===== redactable formats ===== == printed via redact Print(), ok - congruent with %v -‹new-style innerone› +new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -3165,9 +3165,9 @@ Error types: (1) *domains.withDomain (2) *barriers.barrierError == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -‹new-style innerone› +new-style ‹innerone› (1) error domain: pkg -Wraps: (2) ‹new-style innerone› +Wraps: (2) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -3200,14 +3200,14 @@ Wraps: (2) ‹new-style innerone› | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -× +new-style × (1) error domain: pkg -Wraps: (2) × +Wraps: (2) new-style × | × | -- cause hidden behind barrier | new-style × @@ -3240,16 +3240,16 @@ Wraps: (2) × | Wraps: (2) new-style × | | × | Error types: (1) *withstack.withStack (2) *errutil.leafError -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" -Title: "×" +Type: "*barriers.barrierErr" +Title: "new-style ×" (NO STACKTRACE) run diff --git a/fmttests/testdata/format/wrap-newf-via-network b/fmttests/testdata/format/wrap-newf-via-network index 8301d76..fa439f5 100644 --- a/fmttests/testdata/format/wrap-newf-via-network +++ b/fmttests/testdata/format/wrap-newf-via-network @@ -7,8 +7,8 @@ require (?s)innerone.*innertwo ---- &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -35,8 +35,8 @@ require (?s)innerone.*innertwo == %#v &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -133,7 +133,7 @@ Wraps: (3) new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -143,7 +143,7 @@ Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *ba ===== redactable formats ===== == printed via redact Print(), ok - congruent with %v -‹new-style innerone› +new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -151,7 +151,7 @@ Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *ba == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -‹new-style innerone› +new-style ‹innerone› (1) assertion failure Wraps: (2) | (opaque error wrapper) @@ -182,7 +182,7 @@ Wraps: (2) | : | runtime.goexit | : -Wraps: (3) ‹new-style innerone› +Wraps: (3) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -218,12 +218,12 @@ Wraps: (3) ‹new-style innerone› | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -:: × +:: new-style × (1) assertion failure Wraps: (2) | (opaque error wrapper) @@ -254,7 +254,7 @@ Wraps: (2) | : | runtime.goexit | : -Wraps: (3) × +Wraps: (3) new-style × | × | -- cause hidden behind barrier | new-style × @@ -290,18 +290,18 @@ Wraps: (3) × | Wraps: (2) new-style × | | × | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: new-style ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -337,8 +337,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -368,8 +368,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -471,7 +471,7 @@ Wraps: (4) new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -482,7 +482,7 @@ Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *er ===== == printed via redact Print(), ok - congruent with %v assertmsg: ‹outerthree› -‹outerfour›: ‹new-style innerone› +‹outerfour›: new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -490,7 +490,7 @@ assertmsg: ‹outerthree› == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -assertmsg: ‹outerthree›: ‹new-style innerone› +assertmsg: ‹outerthree›: new-style ‹innerone› (1) assertion failure Wraps: (2) | (opaque error wrapper) @@ -523,7 +523,7 @@ Wraps: (2) | : Wraps: (3) assertmsg: ‹outerthree› | ‹outerfour› -Wraps: (4) ‹new-style innerone› +Wraps: (4) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -559,12 +559,12 @@ Wraps: (4) ‹new-style innerone› | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -:: assertmsg: ×: × +:: assertmsg: ×: new-style × (1) assertion failure Wraps: (2) | (opaque error wrapper) @@ -597,7 +597,7 @@ Wraps: (2) | : Wraps: (3) assertmsg: × | × -Wraps: (4) × +Wraps: (4) new-style × | × | -- cause hidden behind barrier | new-style × @@ -633,20 +633,20 @@ Wraps: (4) × | Wraps: (2) new-style × | | × | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: new-style ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -679,8 +679,8 @@ opaque require (?s)innerone.*innertwo ---- -&barriers.barrierError{ - msg: "new-style innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -696,8 +696,8 @@ require (?s)innerone.*innertwo ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "new-style innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -755,7 +755,7 @@ new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -765,7 +765,7 @@ Error types: (1) *barriers.barrierError ===== redactable formats ===== == printed via redact Print(), ok - congruent with %v -‹new-style innerone› +new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -773,8 +773,8 @@ Error types: (1) *barriers.barrierError == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -‹new-style innerone› -(1) ‹new-style innerone› +new-style ‹innerone› +(1) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -810,13 +810,13 @@ Error types: (1) *barriers.barrierError | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -× -(1) × +new-style × +(1) new-style × | × | -- cause hidden behind barrier | new-style × @@ -852,14 +852,14 @@ Error types: (1) *barriers.barrierError | Wraps: (2) new-style × | | × | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" -Title: "×" +Type: "*barriers.barrierErr" +Title: "new-style ×" (NO STACKTRACE) run @@ -3555,8 +3555,8 @@ opaque require (?s)innerone.*innertwo ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -3575,8 +3575,8 @@ require (?s)innerone.*innertwo ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "new-style innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "new-style ‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueWrapper{ cause: &errutil.leafError{msg:"new-style ‹innerone›\n‹innertwo›"}, prefix: "", @@ -3637,7 +3637,7 @@ Wraps: (2) new-style innerone | Wraps: (2) new-style innerone | | innertwo | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -3647,7 +3647,7 @@ Error types: (1) *domains.withDomain (2) *barriers.barrierError ===== redactable formats ===== == printed via redact Print(), ok - congruent with %v -‹new-style innerone› +new-style ‹innerone› ‹innertwo› == printed via redact Printf() %v = Print(), good == printed via redact Printf() %s = Print(), good @@ -3655,9 +3655,9 @@ Error types: (1) *domains.withDomain (2) *barriers.barrierError == printed via redact Printf() %x, refused - good == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v -‹new-style innerone› +new-style ‹innerone› (1) error domain: pkg -Wraps: (2) ‹new-style innerone› +Wraps: (2) new-style ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | new-style ‹innerone› @@ -3693,14 +3693,14 @@ Wraps: (2) ‹new-style innerone› | Wraps: (2) new-style ‹innerone› | | ‹innertwo› | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== == Message payload -× +new-style × (1) error domain: pkg -Wraps: (2) × +Wraps: (2) new-style × | × | -- cause hidden behind barrier | new-style × @@ -3736,16 +3736,16 @@ Wraps: (2) × | Wraps: (2) new-style × | | × | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: +*barriers.barrierErr: details for github.com/cockroachdb/errors/withstack/*withstack.withStack::: *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" -Title: "×" +Type: "*barriers.barrierErr" +Title: "new-style ×" (NO STACKTRACE) run diff --git a/fmttests/testdata/format/wrap-nofmt b/fmttests/testdata/format/wrap-nofmt index 24817aa..3522f77 100644 --- a/fmttests/testdata/format/wrap-nofmt +++ b/fmttests/testdata/format/wrap-nofmt @@ -6,8 +6,8 @@ require (?s) ---- &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, }, stack: &stack{...}, @@ -19,8 +19,8 @@ require (?s) == %#v &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, }, stack: &stack{...}, @@ -70,7 +70,7 @@ Wraps: (3) innerone | (1) innerone | | innertwo | Error types: (1) *fmttests.errNoFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -123,7 +123,7 @@ Wraps: (3) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -163,18 +163,18 @@ Wraps: (3) × | (1) ×× | × | Error types: (1) *fmttests.errNoFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -209,8 +209,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -225,8 +225,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, }, prefix: "assertmsg: ‹outerthree›\n‹outerfour›", @@ -281,7 +281,7 @@ Wraps: (4) innerone | (1) innerone | | innertwo | Error types: (1) *fmttests.errNoFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -337,7 +337,7 @@ Wraps: (4) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -379,20 +379,20 @@ Wraps: (4) × | (1) ×× | × | Error types: (1) *fmttests.errNoFmt -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -424,16 +424,16 @@ barrier outerthree outerfour require (?s) ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, } ===== ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, } == Error() @@ -453,7 +453,7 @@ innerone | (1) innerone | | innertwo | Error types: (1) *fmttests.errNoFmt -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -479,7 +479,7 @@ Error types: (1) *barriers.barrierError | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -492,13 +492,13 @@ Error types: (1) *barriers.barrierError | (1) ×× | × | Error types: (1) *fmttests.errNoFmt -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -1464,8 +1464,8 @@ handled-domain outerthree outerfour require (?s) ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1475,8 +1475,8 @@ require (?s) ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &fmttests.errNoFmt{msg:"innerone\ninnertwo"}, }, domain: "error domain: pkg ", @@ -1499,7 +1499,7 @@ Wraps: (2) innerone | (1) innerone | | innertwo | Error types: (1) *fmttests.errNoFmt -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -1526,7 +1526,7 @@ Wraps: (2) ‹innerone› | (1) ‹innerone›‹› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -1540,15 +1540,15 @@ Wraps: (2) × | (1) ×× | × | Error types: (1) *fmttests.errNoFmt -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-nofmt-via-network b/fmttests/testdata/format/wrap-nofmt-via-network index 003f29d..2ae7344 100644 --- a/fmttests/testdata/format/wrap-nofmt-via-network +++ b/fmttests/testdata/format/wrap-nofmt-via-network @@ -7,8 +7,8 @@ require (?s)innerone.*innertwo ---- &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -34,8 +34,8 @@ require (?s)innerone.*innertwo == %#v &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -105,7 +105,7 @@ Wraps: (3) innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -164,7 +164,7 @@ Wraps: (3) ‹innerone› | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -210,18 +210,18 @@ Wraps: (3) × | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -257,8 +257,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -287,8 +287,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -363,7 +363,7 @@ Wraps: (4) innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -425,7 +425,7 @@ Wraps: (4) ‹innerone› | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -473,20 +473,20 @@ Wraps: (4) × | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -519,8 +519,8 @@ opaque require (?s)innerone.*innertwo ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -535,8 +535,8 @@ require (?s)innerone.*innertwo ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -567,7 +567,7 @@ innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -596,7 +596,7 @@ Error types: (1) *barriers.barrierError | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -612,13 +612,13 @@ Error types: (1) *barriers.barrierError | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -2055,8 +2055,8 @@ opaque require (?s)innerone.*innertwo ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -2074,8 +2074,8 @@ require (?s)innerone.*innertwo ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -2109,7 +2109,7 @@ Wraps: (2) innerone | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -2139,7 +2139,7 @@ Wraps: (2) ‹innerone› | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -2156,15 +2156,15 @@ Wraps: (2) × | | (opaque error leaf) | | type name: github.com/cockroachdb/errors/fmttests/*fmttests.errNoFmt | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: masked error: × +*barriers.barrierErr: masked error: × *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-pkgerr b/fmttests/testdata/format/wrap-pkgerr index 0ad4356..04d47e2 100644 --- a/fmttests/testdata/format/wrap-pkgerr +++ b/fmttests/testdata/format/wrap-pkgerr @@ -6,8 +6,8 @@ require (?s) ---- &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -22,8 +22,8 @@ require (?s) == %#v &assert.withAssertionFailure{ cause: &withstack.withStack{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -101,7 +101,7 @@ Wraps: (3) innerone | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -179,7 +179,7 @@ Wraps: (3) ‹innerone› | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -244,18 +244,18 @@ Wraps: (3) × | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -290,8 +290,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -309,8 +309,8 @@ require (?s)outerthree.*outerfour.* &assert.withAssertionFailure{ cause: &withstack.withStack{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -393,7 +393,7 @@ Wraps: (4) innerone | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -474,7 +474,7 @@ Wraps: (4) ‹innerone› | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -541,20 +541,20 @@ Wraps: (4) × | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -586,8 +586,8 @@ barrier outerthree outerfour require (?s) ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -597,8 +597,8 @@ require (?s) ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -646,7 +646,7 @@ innerone | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -697,7 +697,7 @@ Error types: (1) *barriers.barrierError | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -735,13 +735,13 @@ Error types: (1) *barriers.barrierError | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -2967,8 +2967,8 @@ handled-domain outerthree outerfour require (?s) ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -2981,8 +2981,8 @@ require (?s) ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errors.fundamental{ msg: "innerone\ninnertwo", stack: &stack{...}, @@ -3033,7 +3033,7 @@ Wraps: (2) innerone | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -3085,7 +3085,7 @@ Wraps: (2) ‹innerone› | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -3124,15 +3124,15 @@ Wraps: (2) × | | runtime.goexit | | : | Error types: (1) *errors.fundamental -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) diff --git a/fmttests/testdata/format/wrap-pkgerr-via-network b/fmttests/testdata/format/wrap-pkgerr-via-network index 85123e6..29cdb67 100644 --- a/fmttests/testdata/format/wrap-pkgerr-via-network +++ b/fmttests/testdata/format/wrap-pkgerr-via-network @@ -7,8 +7,8 @@ require (?s)innerone.*innertwo ---- &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -34,8 +34,8 @@ require (?s)innerone.*innertwo == %#v &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -131,7 +131,7 @@ Wraps: (3) innerone | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -216,7 +216,7 @@ Wraps: (3) ‹innerone› | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -288,18 +288,18 @@ Wraps: (3) × | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -335,8 +335,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -365,8 +365,8 @@ require (?s)outerthree.*outerfour.*innerone.*innertwo &assert.withAssertionFailure{ cause: &errbase.opaqueWrapper{ cause: &errutil.withPrefix{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -467,7 +467,7 @@ Wraps: (4) innerone | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -555,7 +555,7 @@ Wraps: (4) ‹innerone› | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -629,20 +629,20 @@ Wraps: (4) × | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierError +Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: *errutil.withPrefix: assertmsg: × :: *withstack.withStack (top exception) *assert.withAssertionFailure == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/errutil/*errutil.withPrefix (*::) github.com/cockroachdb/errors/withstack/*withstack.withStack (*::) github.com/cockroachdb/errors/assert/*assert.withAssertionFailure (*::) == Exception 1 (Module: "error domain: ") Type: ": ...funcNN... -Title: "*barriers.barrierError: assertmsg: ×: ×\nvia *withstack.withStack" +Title: "*barriers.barrierErr: assertmsg: ×: ×\nvia *withstack.withStack" :: (runtime) goexit() :: @@ -675,8 +675,8 @@ opaque require (?s)innerone.*innertwo ---- -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -691,8 +691,8 @@ require (?s)innerone.*innertwo ===== non-redactable formats ===== == %#v -&barriers.barrierError{ - msg: "innerone\ninnertwo", +&barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -749,7 +749,7 @@ innerone | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -804,7 +804,7 @@ Error types: (1) *barriers.barrierError | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -846,13 +846,13 @@ Error types: (1) *barriers.barrierError | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *barriers.barrierError +Error types: (1) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) == Exception 1 (Module: "error domain: ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE) @@ -3501,8 +3501,8 @@ opaque require (?s)innerone.*innertwo ---- &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -3520,8 +3520,8 @@ require (?s)innerone.*innertwo ===== == %#v &domains.withDomain{ - cause: &barriers.barrierError{ - msg: "innerone\ninnertwo", + cause: &barriers.barrierErr{ + smsg: "‹innerone›\n‹innertwo›", maskedErr: &errbase.opaqueLeaf{ msg: "innerone\ninnertwo", details: errorspb.EncodedErrorDetails{ @@ -3581,7 +3581,7 @@ Wraps: (2) innerone | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr == %#v via Formattable() = %#v, good == %v via Formattable() = Error(), good == %s via Formattable() = %v via Formattable(), good @@ -3637,7 +3637,7 @@ Wraps: (2) ‹innerone› | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr ===== ===== Sentry reporting ===== @@ -3680,15 +3680,15 @@ Wraps: (2) × | | runtime.goexit | | : | Error types: (1) *errbase.opaqueLeaf -Error types: (1) *domains.withDomain (2) *barriers.barrierError +Error types: (1) *domains.withDomain (2) *barriers.barrierErr -- report composition: -*barriers.barrierError: details for github.com/pkg/errors/*errors.fundamental::: +*barriers.barrierErr: details for github.com/pkg/errors/*errors.fundamental::: *domains.withDomain: error domain: pkg == Extra "error types" -github.com/cockroachdb/errors/barriers/*barriers.barrierError (*::) +github.com/cockroachdb/errors/barriers/*barriers.barrierErr (*::) github.com/cockroachdb/errors/domains/*domains.withDomain (*::error domain: pkg ) == Exception 1 (Module: "error domain: pkg ") -Type: "*barriers.barrierError" +Type: "*barriers.barrierErr" Title: "×" (NO STACKTRACE)