From 273bb305b20f127f861680896977af6e92c14353 Mon Sep 17 00:00:00 2001 From: Raphael 'kena' Poss Date: Mon, 12 Jun 2023 12:35:19 +0200 Subject: [PATCH] Update the redact dependency. This simplifies/cleans up the handling of empty strings. --- fmttests/testdata/format/leaves | 28 +-- fmttests/testdata/format/leaves-via-network | 4 +- fmttests/testdata/format/opaque | 12 +- fmttests/testdata/format/wrap-fmt | 184 +++++++++--------- fmttests/testdata/format/wrap-fmt-via-network | 8 +- fmttests/testdata/format/wrap-goerr | 184 +++++++++--------- .../testdata/format/wrap-goerr-via-network | 156 +++++++-------- fmttests/testdata/format/wrap-newf | 36 ++-- .../testdata/format/wrap-newf-via-network | 8 +- fmttests/testdata/format/wrap-nofmt | 184 +++++++++--------- .../testdata/format/wrap-nofmt-via-network | 8 +- fmttests/testdata/format/wrap-pkgerr | 184 +++++++++--------- .../testdata/format/wrap-pkgerr-via-network | 8 +- go.mod | 2 +- go.sum | 4 +- 15 files changed, 505 insertions(+), 505 deletions(-) diff --git a/fmttests/testdata/format/leaves b/fmttests/testdata/format/leaves index 86dcf42..55c5754 100644 --- a/fmttests/testdata/format/leaves +++ b/fmttests/testdata/format/leaves @@ -335,7 +335,7 @@ Error types: (1) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› ‹ | -- this is oneline› ‹ | twoline's› @@ -346,7 +346,7 @@ Error types: (1) *fmttests.errFmt ===== == Message payload × -(1) ×× +(1) × × × × @@ -412,7 +412,7 @@ Error types: (1) *fmttests.errFmto == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› Error types: (1) *fmttests.errFmto ===== @@ -420,7 +420,7 @@ Error types: (1) *fmttests.errFmto ===== == Message payload × -(1) ×× +(1) × × Error types: (1) *fmttests.errFmto -- report composition: @@ -483,7 +483,7 @@ Error types: (1) *fmttests.errFmtoDelegate == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› Error types: (1) *fmttests.errFmtoDelegate ===== @@ -491,7 +491,7 @@ Error types: (1) *fmttests.errFmtoDelegate ===== == Message payload × -(1) ×× +(1) × × Error types: (1) *fmttests.errFmtoDelegate -- report composition: @@ -545,7 +545,7 @@ Error types: (1) *fmttests.errFmtp == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› Error types: (1) *fmttests.errFmtp ===== @@ -553,7 +553,7 @@ Error types: (1) *fmttests.errFmtp ===== == Message payload × -(1) ×× +(1) × × Error types: (1) *fmttests.errFmtp -- report composition: @@ -610,7 +610,7 @@ Error types: (1) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› Error types: (1) *errors.errorString ===== @@ -618,7 +618,7 @@ Error types: (1) *errors.errorString ===== == Message payload × -(1) ×× +(1) × × Error types: (1) *errors.errorString -- report composition: @@ -1118,7 +1118,7 @@ Error types: (1) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› Error types: (1) *fmttests.errNoFmt ===== @@ -1126,7 +1126,7 @@ Error types: (1) *fmttests.errNoFmt ===== == Message payload × -(1) ×× +(1) × × Error types: (1) *fmttests.errNoFmt -- report composition: @@ -1525,7 +1525,7 @@ Error types: (1) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› -- stack trace: | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -1558,7 +1558,7 @@ Error types: (1) *errors.fundamental ===== == Message payload :: × -(1) ×× +(1) × × -- stack trace: | github.com/cockroachdb/errors/fmttests.glob...funcNN... diff --git a/fmttests/testdata/format/leaves-via-network b/fmttests/testdata/format/leaves-via-network index 21da540..ee07906 100644 --- a/fmttests/testdata/format/leaves-via-network +++ b/fmttests/testdata/format/leaves-via-network @@ -718,7 +718,7 @@ Error types: (1) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹oneline› -(1) ‹oneline›‹› +(1) ‹oneline› ‹ | twoline› Error types: (1) *errors.errorString ===== @@ -726,7 +726,7 @@ Error types: (1) *errors.errorString ===== == Message payload × -(1) ×× +(1) × × Error types: (1) *errors.errorString -- report composition: diff --git a/fmttests/testdata/format/opaque b/fmttests/testdata/format/opaque index e0acf26..32483e2 100644 --- a/fmttests/testdata/format/opaque +++ b/fmttests/testdata/format/opaque @@ -158,7 +158,7 @@ Error types: (1) *fmttests.werrFmt (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outer›: ‹inner› -(1) ‹outer›‹› +(1) ‹outer› ‹ | outer2ndline› ‹ | -- this is outer› ‹ | outer2ndline's› @@ -174,7 +174,7 @@ Error types: (1) *fmttests.werrFmt (2) *errbase.opaqueLeaf ===== == Message payload ×: × -(1) ×× +(1) × × × × @@ -420,7 +420,7 @@ Error types: (1) *fmttests.werrFmt (2) *errbase.opaqueWrapper (3) *errbase.opaqu == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outer›: ‹middle›: ‹inner› -(1) ‹outer›‹› +(1) ‹outer› ‹ | outer2ndline› ‹ | -- this is outer› ‹ | outer2ndline's› @@ -441,7 +441,7 @@ Error types: (1) *fmttests.werrFmt (2) *errbase.opaqueWrapper (3) *errbase.opaqu ===== == Message payload ×: ×: × -(1) ×× +(1) × × × × @@ -758,7 +758,7 @@ Error types: (1) *fmttests.werrFmt (2) *errbase.opaqueWrapper (3) *errbase.opaqu == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹extern›: ‹outer›: ‹middle›: ‹inner› -(1) ‹extern›‹› +(1) ‹extern› ‹ | extern2ndline› ‹ | -- this is extern› ‹ | extern2ndline's› @@ -784,7 +784,7 @@ Error types: (1) *fmttests.werrFmt (2) *errbase.opaqueWrapper (3) *errbase.opaqu ===== == Message payload ×: ×: ×: × -(1) ×× +(1) × × × × diff --git a/fmttests/testdata/format/wrap-fmt b/fmttests/testdata/format/wrap-fmt index 7e74c24..8c74962 100644 --- a/fmttests/testdata/format/wrap-fmt +++ b/fmttests/testdata/format/wrap-fmt @@ -123,7 +123,7 @@ Wraps: (3) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | ‹ | -- this is innerone› | ‹ | innertwo's› @@ -166,7 +166,7 @@ Wraps: (3) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | × | × @@ -346,7 +346,7 @@ Wraps: (4) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | ‹ | -- this is innerone› | ‹ | innertwo's› @@ -391,7 +391,7 @@ Wraps: (4) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | × | × @@ -497,7 +497,7 @@ Error types: (1) *barriers.barrierErr | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | ‹ | -- this is innerone› | ‹ | innertwo's› @@ -513,7 +513,7 @@ Error types: (1) *barriers.barrierErr | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | × | × @@ -587,11 +587,11 @@ Error types: (1) *fmttests.werrDelegate (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- multi-line› ‹ | wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -602,11 +602,11 @@ Error types: (1) *fmttests.werrDelegate (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -675,7 +675,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *fmttests.errFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -687,7 +687,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *fmttests.errFmt == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × × × @@ -756,7 +756,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *fmttests.errFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) ‹detail› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -768,7 +768,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *fmttests.errFmt == Message payload × (1) × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -841,7 +841,7 @@ Error types: (1) *hintdetail.withDetail (2) *fmttests.errFmt ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -854,7 +854,7 @@ Error types: (1) *hintdetail.withDetail (2) *fmttests.errFmt × (1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -925,7 +925,7 @@ Error types: (1) *domains.withDomain (2) *fmttests.errFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) mydomain -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -937,7 +937,7 @@ Error types: (1) *domains.withDomain (2) *fmttests.errFmt == Message payload × (1) mydomain -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1008,9 +1008,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1021,9 +1021,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *fmttests.errFmt ===== == Message payload × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1092,7 +1092,7 @@ Error types: (1) *fmttests.werrEmpty (2) *fmttests.errFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1104,7 +1104,7 @@ Error types: (1) *fmttests.werrEmpty (2) *fmttests.errFmt == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1180,12 +1180,12 @@ Error types: (1) *fmttests.werrFmt (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- this is outerthree› ‹ | outerfour's› ‹ | multi-line wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1196,12 +1196,12 @@ Error types: (1) *fmttests.werrFmt (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × × × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1288,9 +1288,9 @@ Error types: (1) *fmttests.werrFmto (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1301,9 +1301,9 @@ Error types: (1) *fmttests.werrFmto (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1390,9 +1390,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1403,9 +1403,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1478,9 +1478,9 @@ Error types: (1) *fmttests.werrFmtp (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1491,9 +1491,9 @@ Error types: (1) *fmttests.werrFmtp (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1570,9 +1570,9 @@ Error types: (1) *fmt.wrapError (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1583,9 +1583,9 @@ Error types: (1) *fmt.wrapError (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1671,7 +1671,7 @@ Wraps: (2) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | ‹ | -- this is innerone› | ‹ | innertwo's› @@ -1688,7 +1688,7 @@ Wraps: (2) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | × | × @@ -1762,7 +1762,7 @@ Error types: (1) *hintdetail.withHint (2) *fmttests.errFmt ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1775,7 +1775,7 @@ Error types: (1) *hintdetail.withHint (2) *fmttests.errFmt × (1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1850,7 +1850,7 @@ Error types: (1) *issuelink.withIssueLink (2) *fmttests.errFmt (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1864,7 +1864,7 @@ Error types: (1) *issuelink.withIssueLink (2) *fmttests.errFmt (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1933,7 +1933,7 @@ Error types: (1) *fmttests.werrMigrated (2) *fmttests.errFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -1945,7 +1945,7 @@ Error types: (1) *fmttests.werrMigrated (2) *fmttests.errFmt == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2020,7 +2020,7 @@ outerfour: ‹innerone› outerthree: ‹innerone› (1) outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2033,7 +2033,7 @@ Error types: (1) *errutil.withPrefix (2) *fmttests.errFmt outerthree: × (1) outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2181,7 +2181,7 @@ new-style (‹outerthree› | : Wraps: (2) secondary error attachment | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | ‹ | -- this is innerone› | ‹ | innertwo's› @@ -2190,7 +2190,7 @@ Wraps: (2) secondary error attachment Wraps: (3) new-style (‹outerthree› | ‹outerfour›) :: ‹innerone› | ‹innertwo› :: -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2229,7 +2229,7 @@ Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *err | : Wraps: (2) secondary error attachment | × - | (1) ×× + | (1) × | × | × | × @@ -2238,7 +2238,7 @@ Wraps: (2) secondary error attachment Wraps: (3) new-style (× | ×) :: × | × :: -Wraps: (4) ×× +Wraps: (4) × × × × @@ -2342,9 +2342,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2355,9 +2355,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2436,7 +2436,7 @@ link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› (1) link ‹/path/to/file› ‹/path/to/newfile› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2448,7 +2448,7 @@ Error types: (1) *os.LinkError (2) *fmttests.errFmt == Message payload link × ×: × (1) link × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2529,7 +2529,7 @@ send tcp ‹unixhello›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() send tcp ‹unixhello›: ‹innerone› (1) send tcp ‹unixhello› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2541,7 +2541,7 @@ Error types: (1) *net.OpError (2) *fmttests.errFmt == Message payload send tcp ×: × (1) send tcp × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2618,7 +2618,7 @@ link ‹/path/to/file›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file›: ‹innerone› (1) link ‹/path/to/file› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2630,7 +2630,7 @@ Error types: (1) *fs.PathError (2) *fmttests.errFmt == Message payload link ×: × (1) link × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2705,7 +2705,7 @@ open: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() open: ‹innerone› (1) open -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2717,7 +2717,7 @@ Error types: (1) *os.SyscallError (2) *fmttests.errFmt == Message payload open: × (1) open -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2812,9 +2812,9 @@ Error types: (1) *errors.withMessage (2) *fmttests.errFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -2825,9 +2825,9 @@ Error types: (1) *errors.withMessage (2) *fmttests.errFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2988,7 +2988,7 @@ Error types: (1) *errors.withStack (2) *fmttests.errFmt | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3025,7 +3025,7 @@ Error types: (1) *errors.withStack (2) *fmttests.errFmt | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3121,7 +3121,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *fmttests.errFmt ‹innerone› (1) safe × | × -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3134,7 +3134,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *fmttests.errFmt × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3209,7 +3209,7 @@ safe ‹outerthree› safe ‹outerthree›: ‹innerone› (1) safe ‹outerthree› | ‹outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3222,7 +3222,7 @@ Error types: (1) *fmttests.werrSafeFormat (2) *fmttests.errFmt safe ×: × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3359,7 +3359,7 @@ Error types: (1) *secondary.withSecondaryError (2) *fmttests.errFmt | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3401,7 +3401,7 @@ Error types: (1) *secondary.withSecondaryError (2) *fmttests.errFmt | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3522,7 +3522,7 @@ Error types: (1) *withstack.withStack (2) *fmttests.errFmt | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3559,7 +3559,7 @@ Error types: (1) *withstack.withStack (2) *fmttests.errFmt | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3709,7 +3709,7 @@ Error types: (1) *contexttags.withContext (2) *fmttests.errFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) tags: [k‹123›,safe=456] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3721,7 +3721,7 @@ Error types: (1) *contexttags.withContext (2) *fmttests.errFmt == Message payload × (1) tags: [k×,safe=456] -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3794,7 +3794,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *fmttests.errFmt ‹innerone› (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3807,7 +3807,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *fmttests.errFmt × (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3940,7 +3940,7 @@ new-stylew ‹outerthree›: ‹innerone› | : Wraps: (2) new-stylew ‹outerthree› | ‹outerfour› -Wraps: (3) ‹innerone›‹› +Wraps: (3) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -3979,7 +3979,7 @@ Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *fmttests.errF | : Wraps: (2) new-stylew × | × -Wraps: (3) ×× +Wraps: (3) × × × × @@ -4209,7 +4209,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style ‹outerthree› | ‹outerfour› (payload) -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› ‹ | -- this is innerone› ‹ | innertwo's› @@ -4278,7 +4278,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style × | × (payload) -Wraps: (4) ×× +Wraps: (4) × × × × diff --git a/fmttests/testdata/format/wrap-fmt-via-network b/fmttests/testdata/format/wrap-fmt-via-network index 30635c8..0224506 100644 --- a/fmttests/testdata/format/wrap-fmt-via-network +++ b/fmttests/testdata/format/wrap-fmt-via-network @@ -1258,7 +1258,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) ‹innerone› | ‹innertwo› @@ -1271,7 +1271,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueLeaf ===== == Message payload × -(1) ×× +(1) × × Wraps: (2) × | × @@ -3576,7 +3576,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) ‹innerone› | ‹innertwo› @@ -3589,7 +3589,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueLeaf ===== == Message payload ×: × -(1) ×× +(1) × × Wraps: (2) × | × diff --git a/fmttests/testdata/format/wrap-goerr b/fmttests/testdata/format/wrap-goerr index 79388da..dd610b7 100644 --- a/fmttests/testdata/format/wrap-goerr +++ b/fmttests/testdata/format/wrap-goerr @@ -120,7 +120,7 @@ Wraps: (3) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr @@ -160,7 +160,7 @@ Wraps: (3) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr @@ -334,7 +334,7 @@ Wraps: (4) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr @@ -376,7 +376,7 @@ Wraps: (4) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr @@ -476,7 +476,7 @@ Error types: (1) *barriers.barrierErr | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *barriers.barrierErr @@ -489,7 +489,7 @@ Error types: (1) *barriers.barrierErr | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *barriers.barrierErr @@ -557,11 +557,11 @@ Error types: (1) *fmttests.werrDelegate (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- multi-line› ‹ | wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrDelegate (2) *errors.errorString ===== @@ -569,11 +569,11 @@ Error types: (1) *fmttests.werrDelegate (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrDelegate (2) *errors.errorString -- report composition: @@ -636,7 +636,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrDelegateEmpty (2) *errors.errorString ===== @@ -645,7 +645,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *errors.errorString == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrDelegateEmpty (2) *errors.errorString -- report composition: @@ -708,7 +708,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) ‹detail› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrDelegateNoPrefix (2) *errors.errorString ===== @@ -717,7 +717,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *errors.errorString == Message payload × (1) × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrDelegateNoPrefix (2) *errors.errorString -- report composition: @@ -784,7 +784,7 @@ Error types: (1) *hintdetail.withDetail (2) *errors.errorString ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *hintdetail.withDetail (2) *errors.errorString ===== @@ -794,7 +794,7 @@ Error types: (1) *hintdetail.withDetail (2) *errors.errorString × (1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *hintdetail.withDetail (2) *errors.errorString -- report composition: @@ -859,7 +859,7 @@ Error types: (1) *domains.withDomain (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) mydomain -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *domains.withDomain (2) *errors.errorString ===== @@ -868,7 +868,7 @@ Error types: (1) *domains.withDomain (2) *errors.errorString == Message payload × (1) mydomain -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *domains.withDomain (2) *errors.errorString -- report composition: @@ -933,9 +933,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString ===== @@ -943,9 +943,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString ===== == Message payload × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString -- report composition: @@ -1008,7 +1008,7 @@ Error types: (1) *fmttests.werrEmpty (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrEmpty (2) *errors.errorString ===== @@ -1017,7 +1017,7 @@ Error types: (1) *fmttests.werrEmpty (2) *errors.errorString == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrEmpty (2) *errors.errorString -- report composition: @@ -1087,12 +1087,12 @@ Error types: (1) *fmttests.werrFmt (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- this is outerthree› ‹ | outerfour's› ‹ | multi-line wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmt (2) *errors.errorString ===== @@ -1100,12 +1100,12 @@ Error types: (1) *fmttests.werrFmt (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × × × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmt (2) *errors.errorString -- report composition: @@ -1181,9 +1181,9 @@ Error types: (1) *fmttests.werrFmto (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmto (2) *errors.errorString ===== @@ -1191,9 +1191,9 @@ Error types: (1) *fmttests.werrFmto (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmto (2) *errors.errorString -- report composition: @@ -1269,9 +1269,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmtoDelegate (2) *errors.errorString ===== @@ -1279,9 +1279,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmtoDelegate (2) *errors.errorString -- report composition: @@ -1348,9 +1348,9 @@ Error types: (1) *fmttests.werrFmtp (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmtp (2) *errors.errorString ===== @@ -1358,9 +1358,9 @@ Error types: (1) *fmttests.werrFmtp (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmtp (2) *errors.errorString -- report composition: @@ -1431,9 +1431,9 @@ Error types: (1) *fmt.wrapError (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmt.wrapError (2) *errors.errorString ===== @@ -1441,9 +1441,9 @@ Error types: (1) *fmt.wrapError (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmt.wrapError (2) *errors.errorString -- report composition: @@ -1523,7 +1523,7 @@ Wraps: (2) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *domains.withDomain (2) *barriers.barrierErr @@ -1537,7 +1537,7 @@ Wraps: (2) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *domains.withDomain (2) *barriers.barrierErr @@ -1605,7 +1605,7 @@ Error types: (1) *hintdetail.withHint (2) *errors.errorString ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *hintdetail.withHint (2) *errors.errorString ===== @@ -1615,7 +1615,7 @@ Error types: (1) *hintdetail.withHint (2) *errors.errorString × (1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *hintdetail.withHint (2) *errors.errorString -- report composition: @@ -1684,7 +1684,7 @@ Error types: (1) *issuelink.withIssueLink (2) *errors.errorString (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *issuelink.withIssueLink (2) *errors.errorString ===== @@ -1695,7 +1695,7 @@ Error types: (1) *issuelink.withIssueLink (2) *errors.errorString (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *issuelink.withIssueLink (2) *errors.errorString -- report composition: @@ -1758,7 +1758,7 @@ Error types: (1) *fmttests.werrMigrated (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrMigrated (2) *errors.errorString ===== @@ -1767,7 +1767,7 @@ Error types: (1) *fmttests.werrMigrated (2) *errors.errorString == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrMigrated (2) *errors.errorString -- report composition: @@ -1836,7 +1836,7 @@ outerfour: ‹innerone› outerthree: ‹innerone› (1) outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errutil.withPrefix (2) *errors.errorString ===== @@ -1846,7 +1846,7 @@ Error types: (1) *errutil.withPrefix (2) *errors.errorString outerthree: × (1) outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errutil.withPrefix (2) *errors.errorString -- report composition: @@ -1985,13 +1985,13 @@ new-style (‹outerthree› | : Wraps: (2) secondary error attachment | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Wraps: (3) new-style (‹outerthree› | ‹outerfour›) :: ‹innerone› | ‹innertwo› :: -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withNewMessage (4) *errors.errorString ===== @@ -2027,13 +2027,13 @@ Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *err | : Wraps: (2) secondary error attachment | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Wraps: (3) new-style (× | ×) :: × | × :: -Wraps: (4) ×× +Wraps: (4) × × Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withNewMessage (4) *errors.errorString -- report composition: @@ -2131,9 +2131,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrNoFmt (2) *errors.errorString ===== @@ -2141,9 +2141,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrNoFmt (2) *errors.errorString -- report composition: @@ -2216,7 +2216,7 @@ link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› (1) link ‹/path/to/file› ‹/path/to/newfile› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *os.LinkError (2) *errors.errorString ===== @@ -2225,7 +2225,7 @@ Error types: (1) *os.LinkError (2) *errors.errorString == Message payload link × ×: × (1) link × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *os.LinkError (2) *errors.errorString -- report composition: @@ -2300,7 +2300,7 @@ send tcp ‹unixhello›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() send tcp ‹unixhello›: ‹innerone› (1) send tcp ‹unixhello› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *net.OpError (2) *errors.errorString ===== @@ -2309,7 +2309,7 @@ Error types: (1) *net.OpError (2) *errors.errorString == Message payload send tcp ×: × (1) send tcp × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *net.OpError (2) *errors.errorString -- report composition: @@ -2380,7 +2380,7 @@ link ‹/path/to/file›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file›: ‹innerone› (1) link ‹/path/to/file› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fs.PathError (2) *errors.errorString ===== @@ -2389,7 +2389,7 @@ Error types: (1) *fs.PathError (2) *errors.errorString == Message payload link ×: × (1) link × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fs.PathError (2) *errors.errorString -- report composition: @@ -2458,7 +2458,7 @@ open: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() open: ‹innerone› (1) open -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *os.SyscallError (2) *errors.errorString ===== @@ -2467,7 +2467,7 @@ Error types: (1) *os.SyscallError (2) *errors.errorString == Message payload open: × (1) open -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *os.SyscallError (2) *errors.errorString -- report composition: @@ -2551,9 +2551,9 @@ Error types: (1) *errors.withMessage (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errors.withMessage (2) *errors.errorString ===== @@ -2561,9 +2561,9 @@ Error types: (1) *errors.withMessage (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errors.withMessage (2) *errors.errorString -- report composition: @@ -2713,7 +2713,7 @@ Error types: (1) *errors.withStack (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errors.withStack (2) *errors.errorString ===== @@ -2747,7 +2747,7 @@ Error types: (1) *errors.withStack (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errors.withStack (2) *errors.errorString -- report composition: @@ -2837,7 +2837,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString ‹innerone› (1) safe × | × -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString ===== @@ -2847,7 +2847,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString -- report composition: @@ -2916,7 +2916,7 @@ safe ‹outerthree› safe ‹outerthree›: ‹innerone› (1) safe ‹outerthree› | ‹outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrSafeFormat (2) *errors.errorString ===== @@ -2926,7 +2926,7 @@ Error types: (1) *fmttests.werrSafeFormat (2) *errors.errorString safe ×: × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrSafeFormat (2) *errors.errorString -- report composition: @@ -3057,7 +3057,7 @@ Error types: (1) *secondary.withSecondaryError (2) *errors.errorString | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *secondary.withSecondaryError (2) *errors.errorString ===== @@ -3096,7 +3096,7 @@ Error types: (1) *secondary.withSecondaryError (2) *errors.errorString | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *secondary.withSecondaryError (2) *errors.errorString -- report composition: @@ -3211,7 +3211,7 @@ Error types: (1) *withstack.withStack (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *errors.errorString ===== @@ -3245,7 +3245,7 @@ Error types: (1) *withstack.withStack (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *withstack.withStack (2) *errors.errorString -- report composition: @@ -3389,7 +3389,7 @@ Error types: (1) *contexttags.withContext (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) tags: [k‹123›,safe=456] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *contexttags.withContext (2) *errors.errorString ===== @@ -3398,7 +3398,7 @@ Error types: (1) *contexttags.withContext (2) *errors.errorString == Message payload × (1) tags: [k×,safe=456] -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *contexttags.withContext (2) *errors.errorString -- report composition: @@ -3465,7 +3465,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString ‹innerone› (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString ===== @@ -3475,7 +3475,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString × (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString -- report composition: @@ -3602,7 +3602,7 @@ new-stylew ‹outerthree›: ‹innerone› | : Wraps: (2) new-stylew ‹outerthree› | ‹outerfour› -Wraps: (3) ‹innerone›‹› +Wraps: (3) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *errors.errorString ===== @@ -3638,7 +3638,7 @@ Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *errors.errorS | : Wraps: (2) new-stylew × | × -Wraps: (3) ×× +Wraps: (3) × × Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *errors.errorString -- report composition: @@ -3862,7 +3862,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style ‹outerthree› | ‹outerfour› (payload) -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withPrefix (4) *errors.errorString ===== @@ -3928,7 +3928,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style × | × (payload) -Wraps: (4) ×× +Wraps: (4) × × Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withPrefix (4) *errors.errorString -- report composition: diff --git a/fmttests/testdata/format/wrap-goerr-via-network b/fmttests/testdata/format/wrap-goerr-via-network index 131e23a..5d0d47a 100644 --- a/fmttests/testdata/format/wrap-goerr-via-network +++ b/fmttests/testdata/format/wrap-goerr-via-network @@ -139,7 +139,7 @@ Wraps: (3) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr @@ -182,7 +182,7 @@ Wraps: (3) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *barriers.barrierErr @@ -375,7 +375,7 @@ Wraps: (4) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr @@ -420,7 +420,7 @@ Wraps: (4) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *assert.withAssertionFailure (2) *errbase.opaqueWrapper (3) *errutil.withPrefix (4) *barriers.barrierErr @@ -521,7 +521,7 @@ Error types: (1) *barriers.barrierErr | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *barriers.barrierErr @@ -534,7 +534,7 @@ Error types: (1) *barriers.barrierErr | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *barriers.barrierErr @@ -621,7 +621,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrDelegate -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -634,7 +634,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrDelegate -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -716,7 +716,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrDelegateEmpty -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -727,7 +727,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrDelegateEmpty -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -809,7 +809,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrDelegateNoPrefix -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -820,7 +820,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrDelegateNoPrefix -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -888,7 +888,7 @@ Error types: (1) *hintdetail.withDetail (2) *errors.errorString ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *hintdetail.withDetail (2) *errors.errorString ===== @@ -898,7 +898,7 @@ Error types: (1) *hintdetail.withDetail (2) *errors.errorString × (1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *hintdetail.withDetail (2) *errors.errorString -- report composition: @@ -964,7 +964,7 @@ Error types: (1) *domains.withDomain (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) mydomain -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *domains.withDomain (2) *errors.errorString ===== @@ -973,7 +973,7 @@ Error types: (1) *domains.withDomain (2) *errors.errorString == Message payload × (1) mydomain -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *domains.withDomain (2) *errors.errorString -- report composition: @@ -1039,9 +1039,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString ===== @@ -1049,9 +1049,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString ===== == Message payload × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrWithElidedCause (2) *errors.errorString -- report composition: @@ -1133,7 +1133,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrEmpty -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -1144,7 +1144,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrEmpty -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -1232,7 +1232,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmt -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -1245,7 +1245,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmt -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -1336,7 +1336,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmto -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -1349,7 +1349,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmto -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -1440,7 +1440,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmtoDelegate -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -1453,7 +1453,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmtoDelegate -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -1541,7 +1541,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmtp -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -1554,7 +1554,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrFmtp -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -1645,7 +1645,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: fmt/*fmt.wrapError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -1658,7 +1658,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: fmt/*fmt.wrapError -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -1739,7 +1739,7 @@ Wraps: (2) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Error types: (1) *domains.withDomain (2) *barriers.barrierErr @@ -1753,7 +1753,7 @@ Wraps: (2) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Error types: (1) *domains.withDomain (2) *barriers.barrierErr @@ -1822,7 +1822,7 @@ Error types: (1) *hintdetail.withHint (2) *errors.errorString ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *hintdetail.withHint (2) *errors.errorString ===== @@ -1832,7 +1832,7 @@ Error types: (1) *hintdetail.withHint (2) *errors.errorString × (1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *hintdetail.withHint (2) *errors.errorString -- report composition: @@ -1902,7 +1902,7 @@ Error types: (1) *issuelink.withIssueLink (2) *errors.errorString (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *issuelink.withIssueLink (2) *errors.errorString ===== @@ -1913,7 +1913,7 @@ Error types: (1) *issuelink.withIssueLink (2) *errors.errorString (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *issuelink.withIssueLink (2) *errors.errorString -- report composition: @@ -1995,7 +1995,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrMigrated -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -2006,7 +2006,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString (1) | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrMigrated -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -2076,7 +2076,7 @@ outerfour: ‹innerone› outerthree: ‹innerone› (1) outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errutil.withPrefix (2) *errors.errorString ===== @@ -2086,7 +2086,7 @@ Error types: (1) *errutil.withPrefix (2) *errors.errorString outerthree: × (1) outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errutil.withPrefix (2) *errors.errorString -- report composition: @@ -2244,13 +2244,13 @@ new-style (‹outerthree› | : Wraps: (2) secondary error attachment | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *errors.errorString Wraps: (3) new-style (‹outerthree› | ‹outerfour›) :: ‹innerone› | ‹innertwo› :: -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *secondary.withSecondaryError (3) *errutil.withNewMessage (4) *errors.errorString ===== @@ -2289,13 +2289,13 @@ Error types: (1) *errbase.opaqueWrapper (2) *secondary.withSecondaryError (3) *e | : Wraps: (2) secondary error attachment | × - | (1) ×× + | (1) × | × | Error types: (1) *errors.errorString Wraps: (3) new-style (× | ×) :: × | × :: -Wraps: (4) ×× +Wraps: (4) × × Error types: (1) *errbase.opaqueWrapper (2) *secondary.withSecondaryError (3) *errutil.withNewMessage (4) *errors.errorString -- report composition: @@ -2413,7 +2413,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrNoFmt -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -2426,7 +2426,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrNoFmt -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -2500,7 +2500,7 @@ link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› (1) link ‹/path/to/file› ‹/path/to/newfile› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *os.LinkError (2) *errors.errorString ===== @@ -2509,7 +2509,7 @@ Error types: (1) *os.LinkError (2) *errors.errorString == Message payload link × ×: × (1) link × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *os.LinkError (2) *errors.errorString -- report composition: @@ -2596,7 +2596,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: net/*net.OpError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -2608,7 +2608,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: net/*net.OpError -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -2680,7 +2680,7 @@ link ‹/path/to/file›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file›: ‹innerone› (1) link ‹/path/to/file› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fs.PathError (2) *errors.errorString ===== @@ -2689,7 +2689,7 @@ Error types: (1) *fs.PathError (2) *errors.errorString == Message payload link ×: × (1) link × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fs.PathError (2) *errors.errorString -- report composition: @@ -2759,7 +2759,7 @@ open: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() open: ‹innerone› (1) open -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *os.SyscallError (2) *errors.errorString ===== @@ -2768,7 +2768,7 @@ Error types: (1) *os.SyscallError (2) *errors.errorString == Message payload open: × (1) open -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *os.SyscallError (2) *errors.errorString -- report composition: @@ -2853,9 +2853,9 @@ Error types: (1) *errors.withMessage (2) *errors.errorString == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errors.withMessage (2) *errors.errorString ===== @@ -2863,9 +2863,9 @@ Error types: (1) *errors.withMessage (2) *errors.errorString ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errors.withMessage (2) *errors.errorString -- report composition: @@ -3004,7 +3004,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -3041,7 +3041,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -3132,7 +3132,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString ‹innerone› (1) safe × | × -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString ===== @@ -3142,7 +3142,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *safedetails.withSafeDetails (2) *errors.errorString -- report composition: @@ -3230,7 +3230,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrSafeFormat -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -3243,7 +3243,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | | (opaque error wrapper) | type name: github.com/cockroachdb/errors/fmttests/*fmttests.werrSafeFormat -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -3393,7 +3393,7 @@ Error types: (1) *secondary.withSecondaryError (2) *errors.errorString | Wraps: (2) outerthree | | outerfour | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *secondary.withSecondaryError (2) *errors.errorString ===== @@ -3435,7 +3435,7 @@ Error types: (1) *secondary.withSecondaryError (2) *errors.errorString | Wraps: (2) outerthree | | outerfour | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *secondary.withSecondaryError (2) *errors.errorString -- report composition: @@ -3569,7 +3569,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString ===== @@ -3606,7 +3606,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errbase.opaqueWrapper (2) *errors.errorString -- report composition: @@ -3743,7 +3743,7 @@ Error types: (1) *contexttags.withContext (2) *errors.errorString == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) tags: [k‹123›,safe=‹456›] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *contexttags.withContext (2) *errors.errorString ===== @@ -3752,7 +3752,7 @@ Error types: (1) *contexttags.withContext (2) *errors.errorString == Message payload × (1) tags: [k×,safe=×] -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *contexttags.withContext (2) *errors.errorString -- report composition: @@ -3820,7 +3820,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString ‹innerone› (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString ===== @@ -3830,7 +3830,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString × (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *telemetrykeys.withTelemetry (2) *errors.errorString -- report composition: @@ -3976,7 +3976,7 @@ new-stylew ‹outerthree›: ‹innerone› | : Wraps: (2) new-stylew ‹outerthree› | ‹outerfour› -Wraps: (3) ‹innerone›‹› +Wraps: (3) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *errutil.withPrefix (3) *errors.errorString ===== @@ -4015,7 +4015,7 @@ Error types: (1) *errbase.opaqueWrapper (2) *errutil.withPrefix (3) *errors.erro | : Wraps: (2) new-stylew × | × -Wraps: (3) ×× +Wraps: (3) × × Error types: (1) *errbase.opaqueWrapper (2) *errutil.withPrefix (3) *errors.errorString -- report composition: @@ -4276,7 +4276,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError Wraps: (3) new-style ‹outerthree› | ‹outerfour› (payload) -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› Error types: (1) *errbase.opaqueWrapper (2) *secondary.withSecondaryError (3) *errutil.withPrefix (4) *errors.errorString ===== @@ -4348,7 +4348,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *errbase.opaqueWrapper (2) *errutil.leafError Wraps: (3) new-style × | × (payload) -Wraps: (4) ×× +Wraps: (4) × × Error types: (1) *errbase.opaqueWrapper (2) *secondary.withSecondaryError (3) *errutil.withPrefix (4) *errors.errorString -- report composition: diff --git a/fmttests/testdata/format/wrap-newf b/fmttests/testdata/format/wrap-newf index 560f995..b20803f 100644 --- a/fmttests/testdata/format/wrap-newf +++ b/fmttests/testdata/format/wrap-newf @@ -841,7 +841,7 @@ Error types: (1) *fmttests.werrDelegate (2) *withstack.withStack (3) *errutil.le == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- multi-line› ‹ | wrapper payload› @@ -879,7 +879,7 @@ Error types: (1) *fmttests.werrDelegate (2) *withstack.withStack (3) *errutil.le ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × × × @@ -1762,7 +1762,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *withstack.withStack (3) *err == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -1798,7 +1798,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *withstack.withStack (3) *err ===== == Message payload :: × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: @@ -2134,7 +2134,7 @@ Error types: (1) *fmttests.werrFmt (2) *withstack.withStack (3) *errutil.leafErr == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- this is outerthree› ‹ | outerfour's› @@ -2173,7 +2173,7 @@ Error types: (1) *fmttests.werrFmt (2) *withstack.withStack (3) *errutil.leafErr ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × × × @@ -2365,7 +2365,7 @@ Error types: (1) *fmttests.werrFmto (2) *withstack.withStack (3) *errutil.leafEr == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -2401,7 +2401,7 @@ Error types: (1) *fmttests.werrFmto (2) *withstack.withStack (3) *errutil.leafEr ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: @@ -2590,7 +2590,7 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *withstack.withStack (3) *erruti == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -2626,7 +2626,7 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *withstack.withStack (3) *erruti ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: @@ -2778,7 +2778,7 @@ Error types: (1) *fmttests.werrFmtp (2) *withstack.withStack (3) *errutil.leafEr == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -2814,7 +2814,7 @@ Error types: (1) *fmttests.werrFmtp (2) *withstack.withStack (3) *errutil.leafEr ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: @@ -2970,7 +2970,7 @@ Error types: (1) *fmt.wrapError (2) *withstack.withStack (3) *errutil.leafError == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -3006,7 +3006,7 @@ Error types: (1) *fmt.wrapError (2) *withstack.withStack (3) *errutil.leafError ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: @@ -4434,7 +4434,7 @@ Error types: (1) *fmttests.werrNoFmt (2) *withstack.withStack (3) *errutil.leafE == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -4470,7 +4470,7 @@ Error types: (1) *fmttests.werrNoFmt (2) *withstack.withStack (3) *errutil.leafE ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: @@ -5439,7 +5439,7 @@ Error types: (1) *errors.withMessage (2) *withstack.withStack (3) *errutil.leafE == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) attached stack trace -- stack trace: @@ -5475,7 +5475,7 @@ Error types: (1) *errors.withMessage (2) *withstack.withStack (3) *errutil.leafE ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) attached stack trace -- stack trace: diff --git a/fmttests/testdata/format/wrap-newf-via-network b/fmttests/testdata/format/wrap-newf-via-network index fa439f5..65402e5 100644 --- a/fmttests/testdata/format/wrap-newf-via-network +++ b/fmttests/testdata/format/wrap-newf-via-network @@ -2051,7 +2051,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueWrapper (3) *e == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) | (opaque error wrapper) @@ -2090,7 +2090,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueWrapper (3) *e ===== == Message payload :: × -(1) ×× +(1) × × Wraps: (2) | (opaque error wrapper) @@ -6348,7 +6348,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueWrapper (3) *errutil.lea == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: new-style ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) | (opaque error wrapper) @@ -6387,7 +6387,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueWrapper (3) *errutil.lea ===== == Message payload :: ×: new-style × -(1) ×× +(1) × × Wraps: (2) | (opaque error wrapper) diff --git a/fmttests/testdata/format/wrap-nofmt b/fmttests/testdata/format/wrap-nofmt index 3522f77..fe2f207 100644 --- a/fmttests/testdata/format/wrap-nofmt +++ b/fmttests/testdata/format/wrap-nofmt @@ -120,7 +120,7 @@ Wraps: (3) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr @@ -160,7 +160,7 @@ Wraps: (3) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *fmttests.errNoFmt Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barriers.barrierErr @@ -334,7 +334,7 @@ Wraps: (4) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr @@ -376,7 +376,7 @@ Wraps: (4) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *fmttests.errNoFmt Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *errutil.withPrefix (4) *barriers.barrierErr @@ -476,7 +476,7 @@ Error types: (1) *barriers.barrierErr | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt Error types: (1) *barriers.barrierErr @@ -489,7 +489,7 @@ Error types: (1) *barriers.barrierErr | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *fmttests.errNoFmt Error types: (1) *barriers.barrierErr @@ -557,11 +557,11 @@ Error types: (1) *fmttests.werrDelegate (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- multi-line› ‹ | wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrDelegate (2) *fmttests.errNoFmt ===== @@ -569,11 +569,11 @@ Error types: (1) *fmttests.werrDelegate (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrDelegate (2) *fmttests.errNoFmt -- report composition: @@ -636,7 +636,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *fmttests.errNoFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrDelegateEmpty (2) *fmttests.errNoFmt ===== @@ -645,7 +645,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *fmttests.errNoFmt == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrDelegateEmpty (2) *fmttests.errNoFmt -- report composition: @@ -708,7 +708,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *fmttests.errNoFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) ‹detail› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrDelegateNoPrefix (2) *fmttests.errNoFmt ===== @@ -717,7 +717,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *fmttests.errNoFmt == Message payload × (1) × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrDelegateNoPrefix (2) *fmttests.errNoFmt -- report composition: @@ -784,7 +784,7 @@ Error types: (1) *hintdetail.withDetail (2) *fmttests.errNoFmt ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *hintdetail.withDetail (2) *fmttests.errNoFmt ===== @@ -794,7 +794,7 @@ Error types: (1) *hintdetail.withDetail (2) *fmttests.errNoFmt × (1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *hintdetail.withDetail (2) *fmttests.errNoFmt -- report composition: @@ -859,7 +859,7 @@ Error types: (1) *domains.withDomain (2) *fmttests.errNoFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) mydomain -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *domains.withDomain (2) *fmttests.errNoFmt ===== @@ -868,7 +868,7 @@ Error types: (1) *domains.withDomain (2) *fmttests.errNoFmt == Message payload × (1) mydomain -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *domains.withDomain (2) *fmttests.errNoFmt -- report composition: @@ -933,9 +933,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrWithElidedCause (2) *fmttests.errNoFmt ===== @@ -943,9 +943,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *fmttests.errNoFmt ===== == Message payload × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrWithElidedCause (2) *fmttests.errNoFmt -- report composition: @@ -1008,7 +1008,7 @@ Error types: (1) *fmttests.werrEmpty (2) *fmttests.errNoFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrEmpty (2) *fmttests.errNoFmt ===== @@ -1017,7 +1017,7 @@ Error types: (1) *fmttests.werrEmpty (2) *fmttests.errNoFmt == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrEmpty (2) *fmttests.errNoFmt -- report composition: @@ -1087,12 +1087,12 @@ Error types: (1) *fmttests.werrFmt (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- this is outerthree› ‹ | outerfour's› ‹ | multi-line wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmt (2) *fmttests.errNoFmt ===== @@ -1100,12 +1100,12 @@ Error types: (1) *fmttests.werrFmt (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × × × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmt (2) *fmttests.errNoFmt -- report composition: @@ -1181,9 +1181,9 @@ Error types: (1) *fmttests.werrFmto (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmto (2) *fmttests.errNoFmt ===== @@ -1191,9 +1191,9 @@ Error types: (1) *fmttests.werrFmto (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmto (2) *fmttests.errNoFmt -- report composition: @@ -1269,9 +1269,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmtoDelegate (2) *fmttests.errNoFmt ===== @@ -1279,9 +1279,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmtoDelegate (2) *fmttests.errNoFmt -- report composition: @@ -1348,9 +1348,9 @@ Error types: (1) *fmttests.werrFmtp (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrFmtp (2) *fmttests.errNoFmt ===== @@ -1358,9 +1358,9 @@ Error types: (1) *fmttests.werrFmtp (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrFmtp (2) *fmttests.errNoFmt -- report composition: @@ -1431,9 +1431,9 @@ Error types: (1) *fmt.wrapError (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmt.wrapError (2) *fmttests.errNoFmt ===== @@ -1441,9 +1441,9 @@ Error types: (1) *fmt.wrapError (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmt.wrapError (2) *fmttests.errNoFmt -- report composition: @@ -1523,7 +1523,7 @@ Wraps: (2) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt Error types: (1) *domains.withDomain (2) *barriers.barrierErr @@ -1537,7 +1537,7 @@ Wraps: (2) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | Error types: (1) *fmttests.errNoFmt Error types: (1) *domains.withDomain (2) *barriers.barrierErr @@ -1605,7 +1605,7 @@ Error types: (1) *hintdetail.withHint (2) *fmttests.errNoFmt ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *hintdetail.withHint (2) *fmttests.errNoFmt ===== @@ -1615,7 +1615,7 @@ Error types: (1) *hintdetail.withHint (2) *fmttests.errNoFmt × (1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *hintdetail.withHint (2) *fmttests.errNoFmt -- report composition: @@ -1684,7 +1684,7 @@ Error types: (1) *issuelink.withIssueLink (2) *fmttests.errNoFmt (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *issuelink.withIssueLink (2) *fmttests.errNoFmt ===== @@ -1695,7 +1695,7 @@ Error types: (1) *issuelink.withIssueLink (2) *fmttests.errNoFmt (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *issuelink.withIssueLink (2) *fmttests.errNoFmt -- report composition: @@ -1758,7 +1758,7 @@ Error types: (1) *fmttests.werrMigrated (2) *fmttests.errNoFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrMigrated (2) *fmttests.errNoFmt ===== @@ -1767,7 +1767,7 @@ Error types: (1) *fmttests.werrMigrated (2) *fmttests.errNoFmt == Message payload × (1) -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrMigrated (2) *fmttests.errNoFmt -- report composition: @@ -1836,7 +1836,7 @@ outerfour: ‹innerone› outerthree: ‹innerone› (1) outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errutil.withPrefix (2) *fmttests.errNoFmt ===== @@ -1846,7 +1846,7 @@ Error types: (1) *errutil.withPrefix (2) *fmttests.errNoFmt outerthree: × (1) outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errutil.withPrefix (2) *fmttests.errNoFmt -- report composition: @@ -1985,13 +1985,13 @@ new-style (‹outerthree› | : Wraps: (2) secondary error attachment | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | Error types: (1) *fmttests.errNoFmt Wraps: (3) new-style (‹outerthree› | ‹outerfour›) :: ‹innerone› | ‹innertwo› :: -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withNewMessage (4) *fmttests.errNoFmt ===== @@ -2027,13 +2027,13 @@ Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *err | : Wraps: (2) secondary error attachment | × - | (1) ×× + | (1) × | × | Error types: (1) *fmttests.errNoFmt Wraps: (3) new-style (× | ×) :: × | × :: -Wraps: (4) ×× +Wraps: (4) × × Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withNewMessage (4) *fmttests.errNoFmt -- report composition: @@ -2131,9 +2131,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrNoFmt (2) *fmttests.errNoFmt ===== @@ -2141,9 +2141,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrNoFmt (2) *fmttests.errNoFmt -- report composition: @@ -2216,7 +2216,7 @@ link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› (1) link ‹/path/to/file› ‹/path/to/newfile› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *os.LinkError (2) *fmttests.errNoFmt ===== @@ -2225,7 +2225,7 @@ Error types: (1) *os.LinkError (2) *fmttests.errNoFmt == Message payload link × ×: × (1) link × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *os.LinkError (2) *fmttests.errNoFmt -- report composition: @@ -2300,7 +2300,7 @@ send tcp ‹unixhello›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() send tcp ‹unixhello›: ‹innerone› (1) send tcp ‹unixhello› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *net.OpError (2) *fmttests.errNoFmt ===== @@ -2309,7 +2309,7 @@ Error types: (1) *net.OpError (2) *fmttests.errNoFmt == Message payload send tcp ×: × (1) send tcp × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *net.OpError (2) *fmttests.errNoFmt -- report composition: @@ -2380,7 +2380,7 @@ link ‹/path/to/file›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file›: ‹innerone› (1) link ‹/path/to/file› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fs.PathError (2) *fmttests.errNoFmt ===== @@ -2389,7 +2389,7 @@ Error types: (1) *fs.PathError (2) *fmttests.errNoFmt == Message payload link ×: × (1) link × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fs.PathError (2) *fmttests.errNoFmt -- report composition: @@ -2458,7 +2458,7 @@ open: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() open: ‹innerone› (1) open -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *os.SyscallError (2) *fmttests.errNoFmt ===== @@ -2467,7 +2467,7 @@ Error types: (1) *os.SyscallError (2) *fmttests.errNoFmt == Message payload open: × (1) open -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *os.SyscallError (2) *fmttests.errNoFmt -- report composition: @@ -2551,9 +2551,9 @@ Error types: (1) *errors.withMessage (2) *fmttests.errNoFmt == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errors.withMessage (2) *fmttests.errNoFmt ===== @@ -2561,9 +2561,9 @@ Error types: (1) *errors.withMessage (2) *fmttests.errNoFmt ===== == Message payload ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errors.withMessage (2) *fmttests.errNoFmt -- report composition: @@ -2713,7 +2713,7 @@ Error types: (1) *errors.withStack (2) *fmttests.errNoFmt | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *errors.withStack (2) *fmttests.errNoFmt ===== @@ -2747,7 +2747,7 @@ Error types: (1) *errors.withStack (2) *fmttests.errNoFmt | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *errors.withStack (2) *fmttests.errNoFmt -- report composition: @@ -2837,7 +2837,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *fmttests.errNoFmt ‹innerone› (1) safe × | × -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *safedetails.withSafeDetails (2) *fmttests.errNoFmt ===== @@ -2847,7 +2847,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *fmttests.errNoFmt × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *safedetails.withSafeDetails (2) *fmttests.errNoFmt -- report composition: @@ -2916,7 +2916,7 @@ safe ‹outerthree› safe ‹outerthree›: ‹innerone› (1) safe ‹outerthree› | ‹outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *fmttests.werrSafeFormat (2) *fmttests.errNoFmt ===== @@ -2926,7 +2926,7 @@ Error types: (1) *fmttests.werrSafeFormat (2) *fmttests.errNoFmt safe ×: × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *fmttests.werrSafeFormat (2) *fmttests.errNoFmt -- report composition: @@ -3057,7 +3057,7 @@ Error types: (1) *secondary.withSecondaryError (2) *fmttests.errNoFmt | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *secondary.withSecondaryError (2) *fmttests.errNoFmt ===== @@ -3096,7 +3096,7 @@ Error types: (1) *secondary.withSecondaryError (2) *fmttests.errNoFmt | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *secondary.withSecondaryError (2) *fmttests.errNoFmt -- report composition: @@ -3211,7 +3211,7 @@ Error types: (1) *withstack.withStack (2) *fmttests.errNoFmt | : | runtime.goexit | : -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *fmttests.errNoFmt ===== @@ -3245,7 +3245,7 @@ Error types: (1) *withstack.withStack (2) *fmttests.errNoFmt | : | runtime.goexit | : -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *withstack.withStack (2) *fmttests.errNoFmt -- report composition: @@ -3389,7 +3389,7 @@ Error types: (1) *contexttags.withContext (2) *fmttests.errNoFmt == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) tags: [k‹123›,safe=456] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *contexttags.withContext (2) *fmttests.errNoFmt ===== @@ -3398,7 +3398,7 @@ Error types: (1) *contexttags.withContext (2) *fmttests.errNoFmt == Message payload × (1) tags: [k×,safe=456] -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *contexttags.withContext (2) *fmttests.errNoFmt -- report composition: @@ -3465,7 +3465,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *fmttests.errNoFmt ‹innerone› (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› Error types: (1) *telemetrykeys.withTelemetry (2) *fmttests.errNoFmt ===== @@ -3475,7 +3475,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *fmttests.errNoFmt × (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ×× +Wraps: (2) × × Error types: (1) *telemetrykeys.withTelemetry (2) *fmttests.errNoFmt -- report composition: @@ -3602,7 +3602,7 @@ new-stylew ‹outerthree›: ‹innerone› | : Wraps: (2) new-stylew ‹outerthree› | ‹outerfour› -Wraps: (3) ‹innerone›‹› +Wraps: (3) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *fmttests.errNoFmt ===== @@ -3638,7 +3638,7 @@ Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *fmttests.errN | : Wraps: (2) new-stylew × | × -Wraps: (3) ×× +Wraps: (3) × × Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *fmttests.errNoFmt -- report composition: @@ -3862,7 +3862,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style ‹outerthree› | ‹outerfour› (payload) -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withPrefix (4) *fmttests.errNoFmt ===== @@ -3928,7 +3928,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style × | × (payload) -Wraps: (4) ×× +Wraps: (4) × × Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *errutil.withPrefix (4) *fmttests.errNoFmt -- report composition: diff --git a/fmttests/testdata/format/wrap-nofmt-via-network b/fmttests/testdata/format/wrap-nofmt-via-network index 2ae7344..4ee0c9b 100644 --- a/fmttests/testdata/format/wrap-nofmt-via-network +++ b/fmttests/testdata/format/wrap-nofmt-via-network @@ -1258,7 +1258,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) ‹innerone› | ‹innertwo› @@ -1271,7 +1271,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueLeaf ===== == Message payload × -(1) ×× +(1) × × Wraps: (2) × | × @@ -3576,7 +3576,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) ‹innerone› | ‹innertwo› @@ -3589,7 +3589,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueLeaf ===== == Message payload ×: × -(1) ×× +(1) × × Wraps: (2) × | × diff --git a/fmttests/testdata/format/wrap-pkgerr b/fmttests/testdata/format/wrap-pkgerr index 04d47e2..aeb4316 100644 --- a/fmttests/testdata/format/wrap-pkgerr +++ b/fmttests/testdata/format/wrap-pkgerr @@ -151,7 +151,7 @@ Wraps: (3) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -216,7 +216,7 @@ Wraps: (3) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -446,7 +446,7 @@ Wraps: (4) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -513,7 +513,7 @@ Wraps: (4) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -669,7 +669,7 @@ Error types: (1) *barriers.barrierErr | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -707,7 +707,7 @@ Error types: (1) *barriers.barrierErr | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -830,11 +830,11 @@ Error types: (1) *fmttests.werrDelegate (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- multi-line› ‹ | wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -866,11 +866,11 @@ Error types: (1) *fmttests.werrDelegate (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1010,7 +1010,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *errors.fundamental == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -1043,7 +1043,7 @@ Error types: (1) *fmttests.werrDelegateEmpty (2) *errors.fundamental == Message payload :: × (1) -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1183,7 +1183,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *errors.fundamental == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) ‹detail› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -1216,7 +1216,7 @@ Error types: (1) *fmttests.werrDelegateNoPrefix (2) *errors.fundamental == Message payload :: × (1) × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1360,7 +1360,7 @@ Error types: (1) *hintdetail.withDetail (2) *errors.fundamental ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -1394,7 +1394,7 @@ Error types: (1) *hintdetail.withDetail (2) *errors.fundamental :: × (1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1536,7 +1536,7 @@ Error types: (1) *domains.withDomain (2) *errors.fundamental == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) mydomain -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -1569,7 +1569,7 @@ Error types: (1) *domains.withDomain (2) *errors.fundamental == Message payload :: × (1) mydomain -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1711,9 +1711,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -1745,9 +1745,9 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errors.fundamental ===== == Message payload :: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -1887,7 +1887,7 @@ Error types: (1) *fmttests.werrEmpty (2) *errors.fundamental == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -1920,7 +1920,7 @@ Error types: (1) *fmttests.werrEmpty (2) *errors.fundamental == Message payload :: × (1) -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2067,12 +2067,12 @@ Error types: (1) *fmttests.werrFmt (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› ‹ | -- this is outerthree› ‹ | outerfour's› ‹ | multi-line wrapper payload› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -2104,12 +2104,12 @@ Error types: (1) *fmttests.werrFmt (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × × × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2286,9 +2286,9 @@ Error types: (1) *fmttests.werrFmto (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -2320,9 +2320,9 @@ Error types: (1) *fmttests.werrFmto (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2499,9 +2499,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -2533,9 +2533,9 @@ Error types: (1) *fmttests.werrFmtoDelegate (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2679,9 +2679,9 @@ Error types: (1) *fmttests.werrFmtp (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -2713,9 +2713,9 @@ Error types: (1) *fmttests.werrFmtp (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -2863,9 +2863,9 @@ Error types: (1) *fmt.wrapError (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -2897,9 +2897,9 @@ Error types: (1) *fmt.wrapError (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3057,7 +3057,7 @@ Wraps: (2) ‹innerone› | ‹innertwo› | -- cause hidden behind barrier | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -3096,7 +3096,7 @@ Wraps: (2) × | × | -- cause hidden behind barrier | × - | (1) ×× + | (1) × | × | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -3219,7 +3219,7 @@ Error types: (1) *hintdetail.withHint (2) *errors.fundamental ‹innerone› (1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -3253,7 +3253,7 @@ Error types: (1) *hintdetail.withHint (2) *errors.fundamental :: × (1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3399,7 +3399,7 @@ Error types: (1) *issuelink.withIssueLink (2) *errors.fundamental (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -3434,7 +3434,7 @@ Error types: (1) *issuelink.withIssueLink (2) *errors.fundamental (1) issue: https://mysite | detail: outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3574,7 +3574,7 @@ Error types: (1) *fmttests.werrMigrated (2) *errors.fundamental == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -3607,7 +3607,7 @@ Error types: (1) *fmttests.werrMigrated (2) *errors.fundamental == Message payload :: × (1) -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3753,7 +3753,7 @@ outerfour: ‹innerone› outerthree: ‹innerone› (1) outerthree | outerfour -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -3787,7 +3787,7 @@ Error types: (1) *errutil.withPrefix (2) *errors.fundamental :: outerthree: × (1) outerthree | outerfour -Wraps: (2) ×× +Wraps: (2) × × × × @@ -3992,7 +3992,7 @@ new-style (‹outerthree› | [...repeated from below...] Wraps: (2) secondary error attachment | ‹innerone› - | (1) ‹innerone›‹› + | (1) ‹innerone› | ‹ | innertwo› | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -4023,7 +4023,7 @@ Wraps: (2) secondary error attachment Wraps: (3) new-style (‹outerthree› | ‹outerfour›) :: ‹innerone› | ‹innertwo› :: -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -4062,7 +4062,7 @@ Error types: (1) *withstack.withStack (2) *secondary.withSecondaryError (3) *err | [...repeated from below...] Wraps: (2) secondary error attachment | × - | (1) ×× + | (1) × | × | -- stack trace: | | github.com/cockroachdb/errors/fmttests.glob...funcNN... @@ -4093,7 +4093,7 @@ Wraps: (2) secondary error attachment Wraps: (3) new-style (× | ×) :: × | × :: -Wraps: (4) ×× +Wraps: (4) × × × × @@ -4273,9 +4273,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -4307,9 +4307,9 @@ Error types: (1) *fmttests.werrNoFmt (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -4460,7 +4460,7 @@ link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file› ‹/path/to/newfile›: ‹innerone› (1) link ‹/path/to/file› ‹/path/to/newfile› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -4493,7 +4493,7 @@ Error types: (1) *os.LinkError (2) *errors.fundamental == Message payload :: link × ×: × (1) link × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -4646,7 +4646,7 @@ send tcp ‹unixhello›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() send tcp ‹unixhello›: ‹innerone› (1) send tcp ‹unixhello› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -4679,7 +4679,7 @@ Error types: (1) *net.OpError (2) *errors.fundamental == Message payload :: send tcp ×: × (1) send tcp × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -4828,7 +4828,7 @@ link ‹/path/to/file›: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() link ‹/path/to/file›: ‹innerone› (1) link ‹/path/to/file› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -4861,7 +4861,7 @@ Error types: (1) *fs.PathError (2) *errors.fundamental == Message payload :: link ×: × (1) link × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -5008,7 +5008,7 @@ open: ‹innerone› == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() open: ‹innerone› (1) open -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -5041,7 +5041,7 @@ Error types: (1) *os.SyscallError (2) *errors.fundamental == Message payload :: open: × (1) open -Wraps: (2) ×× +Wraps: (2) × × × × @@ -5226,9 +5226,9 @@ Error types: (1) *errors.withMessage (2) *errors.fundamental == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -5260,9 +5260,9 @@ Error types: (1) *errors.withMessage (2) *errors.fundamental ===== == Message payload :: ×: × -(1) ×× +(1) × × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -5471,7 +5471,7 @@ Error types: (1) *errors.withStack (2) *errors.fundamental | github.com/cockroachdb/errors/fmttests.glob...funcNN... | : | [...repeated from below...] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -5508,7 +5508,7 @@ Error types: (1) *errors.withStack (2) *errors.fundamental | github.com/cockroachdb/errors/fmttests.glob...funcNN... | : | [...repeated from below...] -Wraps: (2) ×× +Wraps: (2) × × × × @@ -5680,7 +5680,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *errors.fundamental ‹innerone› (1) safe × | × -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -5714,7 +5714,7 @@ Error types: (1) *safedetails.withSafeDetails (2) *errors.fundamental :: × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -5860,7 +5860,7 @@ safe ‹outerthree› safe ‹outerthree›: ‹innerone› (1) safe ‹outerthree› | ‹outerfour› -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -5894,7 +5894,7 @@ Error types: (1) *fmttests.werrSafeFormat (2) *errors.fundamental :: safe ×: × (1) safe × | × -Wraps: (2) ×× +Wraps: (2) × × × × @@ -6102,7 +6102,7 @@ Error types: (1) *secondary.withSecondaryError (2) *errors.fundamental | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -6165,7 +6165,7 @@ Error types: (1) *secondary.withSecondaryError (2) *errors.fundamental | Wraps: (2) outerthree | | outerfour | Error types: (1) *withstack.withStack (2) *errutil.leafError -Wraps: (2) ×× +Wraps: (2) × × × × @@ -6315,7 +6315,7 @@ Error types: (1) *withstack.withStack (2) *errors.fundamental | github.com/cockroachdb/errors/fmttests.glob...funcNN... | : | [...repeated from below...] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -6352,7 +6352,7 @@ Error types: (1) *withstack.withStack (2) *errors.fundamental | github.com/cockroachdb/errors/fmttests.glob...funcNN... | : | [...repeated from below...] -Wraps: (2) ×× +Wraps: (2) × × × × @@ -6578,7 +6578,7 @@ Error types: (1) *contexttags.withContext (2) *errors.fundamental == printed via redact Printf() %+v, ok - congruent with %+v ‹innerone› (1) tags: [k‹123›,safe=456] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -6611,7 +6611,7 @@ Error types: (1) *contexttags.withContext (2) *errors.fundamental == Message payload :: × (1) tags: [k×,safe=456] -Wraps: (2) ×× +Wraps: (2) × × × × @@ -6755,7 +6755,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *errors.fundamental ‹innerone› (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ‹innerone›‹› +Wraps: (2) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -6789,7 +6789,7 @@ Error types: (1) *telemetrykeys.withTelemetry (2) *errors.fundamental :: × (1) keys: [somekey outerthree | outerfour] -Wraps: (2) ×× +Wraps: (2) × × × × @@ -6951,7 +6951,7 @@ new-stylew ‹outerthree›: ‹innerone› | [...repeated from below...] Wraps: (2) new-stylew ‹outerthree› | ‹outerfour› -Wraps: (3) ‹innerone›‹› +Wraps: (3) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -6990,7 +6990,7 @@ Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *errors.fundam | [...repeated from below...] Wraps: (2) new-stylew × | × -Wraps: (3) ×× +Wraps: (3) × × × × @@ -7254,7 +7254,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style ‹outerthree› | ‹outerfour› (payload) -Wraps: (4) ‹innerone›‹› +Wraps: (4) ‹innerone› ‹ | innertwo› ‹ | github.com/cockroachdb/errors/fmttests.glob..func9› ‹ | :› @@ -7323,7 +7323,7 @@ Wraps: (2) secondary error attachment | Error types: (1) *withstack.withStack (2) *errutil.leafError Wraps: (3) new-style × | × (payload) -Wraps: (4) ×× +Wraps: (4) × × × × diff --git a/fmttests/testdata/format/wrap-pkgerr-via-network b/fmttests/testdata/format/wrap-pkgerr-via-network index 29cdb67..ff04eba 100644 --- a/fmttests/testdata/format/wrap-pkgerr-via-network +++ b/fmttests/testdata/format/wrap-pkgerr-via-network @@ -2023,7 +2023,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v ‹outerthree› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) ‹innerone› | ‹innertwo› @@ -2062,7 +2062,7 @@ Error types: (1) *fmttests.werrWithElidedCause (2) *errbase.opaqueLeaf ===== == Message payload :: × -(1) ×× +(1) × × Wraps: (2) × | × @@ -6245,7 +6245,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueLeaf == printed via redact Printf() %X, refused - good == printed via redact Printf() %+v, ok - congruent with %+v via Formattable() ‹outerthree›: ‹innerone› -(1) ‹outerthree›‹› +(1) ‹outerthree› ‹ | outerfour› Wraps: (2) ‹innerone› | ‹innertwo› @@ -6284,7 +6284,7 @@ Error types: (1) *errors.withMessage (2) *errbase.opaqueLeaf ===== == Message payload :: ×: × -(1) ×× +(1) × × Wraps: (2) × | × diff --git a/go.mod b/go.mod index 00f708f..e82dca3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/cockroachdb/datadriven v1.0.2 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b - github.com/cockroachdb/redact v1.1.3 + github.com/cockroachdb/redact v1.1.5 github.com/getsentry/sentry-go v0.18.0 github.com/gogo/googleapis v1.4.1 // gogoproto 1.2-compatible, for CRDB github.com/gogo/protobuf v1.3.2 diff --git a/go.sum b/go.sum index bdb69ff..98d1124 100644 --- a/go.sum +++ b/go.sum @@ -568,8 +568,8 @@ github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD9 github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= -github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= +github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=