Skip to content

Commit ac352b8

Browse files
committed
Bump the redact dependency
This fixes the handling of `%T`.
1 parent 7540597 commit ac352b8

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

errutil/message_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -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)
6969
Error 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)
101101
Wraps: (3) woo
102102
Error 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
159159
Wraps: (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)
168168
Wraps: (4) wuu: woo
169169
| -- cause hidden behind barrier
170170
| wuu: woo

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.13
55
require (
66
github.com/cockroachdb/datadriven v1.0.0
77
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f
8-
github.com/cockroachdb/redact v1.0.2
8+
github.com/cockroachdb/redact v1.0.3
99
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2
1010
github.com/gogo/protobuf v1.3.1
1111
github.com/gogo/status v1.1.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlN
1717
github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM=
1818
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
1919
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
20-
github.com/cockroachdb/redact v1.0.2 h1:bRktqHBXPqI+9bkOx0ikn9RS09G9k83oAdLx6rXRVTQ=
21-
github.com/cockroachdb/redact v1.0.2/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
20+
github.com/cockroachdb/redact v1.0.3 h1:4lmeIkElRccCKh7u2eb0P/pP8BAgyqarO5/ZyWIQ2BM=
21+
github.com/cockroachdb/redact v1.0.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
2222
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=
2323
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
2424
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=

0 commit comments

Comments
 (0)