goprotobuf: Consistently prefix error strings with "proto: ".
R=r
CC=golang-dev
https://codereview.appspot.com/13618043
diff --git a/proto/decode.go b/proto/decode.go
index 705d38d..3c58cfb 100644
--- a/proto/decode.go
+++ b/proto/decode.go
@@ -46,7 +46,7 @@
// ErrWrongType occurs when the wire encoding for the field disagrees with
// that specified in the type being decoded. This is usually caused by attempting
// to convert an encoded protocol buffer into a struct of the wrong type.
-var ErrWrongType = errors.New("field/encoding mismatch: wrong type for field")
+var ErrWrongType = errors.New("proto: field/encoding mismatch: wrong type for field")
// errOverflow is returned when an integer is too large to be represented.
var errOverflow = errors.New("proto: integer overflow")
diff --git a/proto/extensions.go b/proto/extensions.go
index 1e1e4dc..e730b68 100644
--- a/proto/extensions.go
+++ b/proto/extensions.go
@@ -109,11 +109,11 @@
func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
// Check the extended type.
if a, b := reflect.TypeOf(pb), reflect.TypeOf(extension.ExtendedType); a != b {
- return errors.New("bad extended type; " + b.String() + " does not extend " + a.String())
+ return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
}
// Check the range.
if !isExtensionField(pb, extension.Field) {
- return errors.New("bad extension number; not in declared ranges")
+ return errors.New("proto: bad extension number; not in declared ranges")
}
return nil
}
@@ -272,7 +272,7 @@
func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
epb, ok := pb.(extendableProto)
if !ok {
- err = errors.New("not an extendable proto")
+ err = errors.New("proto: not an extendable proto")
return
}
extensions = make([]interface{}, len(es))
@@ -292,7 +292,7 @@
}
typ := reflect.TypeOf(extension.ExtensionType)
if typ != reflect.TypeOf(value) {
- return errors.New("bad extension value type")
+ return errors.New("proto: bad extension value type")
}
pb.ExtensionMap()[extension.Field] = Extension{desc: extension, value: value}
diff --git a/proto/text_parser.go b/proto/text_parser.go
index f39b908..13827f6 100644
--- a/proto/text_parser.go
+++ b/proto/text_parser.go
@@ -193,8 +193,8 @@
}
var (
- errBadUTF8 = errors.New("bad UTF-8")
- errBadHex = errors.New("bad hexadecimal")
+ errBadUTF8 = errors.New("proto: bad UTF-8")
+ errBadHex = errors.New("proto: bad hexadecimal")
)
func unquoteC(s string, quote rune) (string, error) {
diff --git a/proto/text_test.go b/proto/text_test.go
index f5d0574..c64b073 100644
--- a/proto/text_test.go
+++ b/proto/text_test.go
@@ -303,7 +303,7 @@
limit int
}
-var outOfSpace = errors.New("insufficient space")
+var outOfSpace = errors.New("proto: insufficient space")
func (w *limitedWriter) Write(p []byte) (n int, err error) {
var avail = w.limit - w.b.Len()