Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(497)

Unified Diff: luci_config/server/cfgclient/backend/caching/codec.go

Issue 2963503003: [errors] Greatly simplify common/errors package. (Closed)
Patch Set: fix nits Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: luci_config/server/cfgclient/backend/caching/codec.go
diff --git a/luci_config/server/cfgclient/backend/caching/codec.go b/luci_config/server/cfgclient/backend/caching/codec.go
index bca448800c4c9fc0e4ea2b3f73735311381e5c5f..8d1c5e853a3c5810a908eae0da97f4c85009899a 100644
--- a/luci_config/server/cfgclient/backend/caching/codec.go
+++ b/luci_config/server/cfgclient/backend/caching/codec.go
@@ -24,10 +24,10 @@ func Encode(v interface{}) ([]byte, error) {
if err := enc.Encode(v); err != nil {
zw.Close()
- return nil, errors.Annotate(err).Reason("failed to JSON-encode").Err()
+ return nil, errors.Annotate(err, "failed to JSON-encode").Err()
}
if err := zw.Close(); err != nil {
- return nil, errors.Annotate(err).Reason("failed to Close zlib Writer").Err()
+ return nil, errors.Annotate(err, "failed to Close zlib Writer").Err()
}
return buf.Bytes(), nil
}
@@ -37,12 +37,12 @@ func Encode(v interface{}) ([]byte, error) {
func Decode(d []byte, v interface{}) error {
zr, err := zlib.NewReader(bytes.NewReader(d))
if err != nil {
- return errors.Annotate(err).Reason("failed to create zlib Reader").Err()
+ return errors.Annotate(err, "failed to create zlib Reader").Err()
}
defer zr.Close()
if err := json.NewDecoder(zr).Decode(v); err != nil {
- return errors.Annotate(err).Reason("failed to JSON-decode").Err()
+ return errors.Annotate(err, "failed to JSON-decode").Err()
}
return nil
}
« no previous file with comments | « luci_config/server/cfgclient/backend/authority.go ('k') | luci_config/server/cfgclient/backend/caching/config.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698