@@ -55,8 +55,8 @@ Error types: (1) *withstack.withStack (2) *errutil.leafError`,
5555
5656 {"newf-empty-arg" ,
5757 errutil .Newf (emptyString , 123 ),
58- `%!(EXTRA *redact.escapeArg =123)` , `
59- %!(EXTRA *redact.escapeArg =123)
58+ `%!(EXTRA int =123)` , `
59+ %!(EXTRA int =123)
6060(1) attached stack trace
6161 -- stack trace:
6262 | github.com/cockroachdb/errors/errutil_test.TestFormat
@@ -65,7 +65,7 @@ Error types: (1) *withstack.withStack (2) *errutil.leafError`,
6565 | <tab><path>
6666 | runtime.goexit
6767 | <tab><path>
68- Wraps: (2) %!(EXTRA *redact.escapeArg =123)
68+ Wraps: (2) %!(EXTRA int =123)
6969Error types: (1) *withstack.withStack (2) *errutil.leafError` ,
7070 },
7171
@@ -87,8 +87,8 @@ Error types: (1) *withstack.withStack (2) *errors.errorString`,
8787
8888 {"wrapf-empty-arg" ,
8989 errutil .Wrapf (goErr .New ("woo" ), emptyString , 123 ),
90- `%!(EXTRA *redact.escapeArg =123): woo` , `
91- %!(EXTRA *redact.escapeArg =123): woo
90+ `%!(EXTRA int =123): woo` , `
91+ %!(EXTRA int =123): woo
9292(1) attached stack trace
9393 -- stack trace:
9494 | github.com/cockroachdb/errors/errutil_test.TestFormat
@@ -97,7 +97,7 @@ Error types: (1) *withstack.withStack (2) *errors.errorString`,
9797 | <tab><path>
9898 | runtime.goexit
9999 | <tab><path>
100- Wraps: (2) %!(EXTRA *redact.escapeArg =123)
100+ Wraps: (2) %!(EXTRA int =123)
101101Wraps: (3) woo
102102Error types: (1) *withstack.withStack (2) *errutil.withPrefix (3) *errors.errorString` ,
103103 },
@@ -153,8 +153,8 @@ Error types: (1) *assert.withAssertionFailure (2) *withstack.withStack (3) *barr
153153
154154 {"assert + wrap empty+arg" ,
155155 errutil .NewAssertionErrorWithWrappedErrf (& werrFmt {goErr .New ("woo" ), "wuu" }, emptyString , 123 ),
156- `%!(EXTRA *redact.escapeArg =123): wuu: woo` , `
157- %!(EXTRA *redact.escapeArg =123): wuu: woo
156+ `%!(EXTRA int =123): wuu: woo` , `
157+ %!(EXTRA int =123): wuu: woo
158158(1) assertion failure
159159Wraps: (2) attached stack trace
160160 -- stack trace:
@@ -164,7 +164,7 @@ Wraps: (2) attached stack trace
164164 | <tab><path>
165165 | runtime.goexit
166166 | <tab><path>
167- Wraps: (3) %!(EXTRA *redact.escapeArg =123)
167+ Wraps: (3) %!(EXTRA int =123)
168168Wraps: (4) wuu: woo
169169 | -- cause hidden behind barrier
170170 | wuu: woo
0 commit comments