Upgrade to 0.12

1 files changed, 12 insertions, 26 deletions

diff --git a/vendor/github.com/golang/protobuf/proto/lib.go b/vendor/github.com/golang/protobuf/proto/lib.go
index 75565cc..fdd328b 100644
--- a/vendor/github.com/golang/protobuf/proto/lib.go
+++ b/vendor/github.com/golang/protobuf/proto/lib.go
@@ -341,26 +341,6 @@ type Message interface {
         ProtoMessage()
 }
 
-// Stats records allocation details about the protocol buffer encoders
-// and decoders.  Useful for tuning the library itself.
-type Stats struct {
-        Emalloc uint64 // mallocs in encode
-        Dmalloc uint64 // mallocs in decode
-        Encode  uint64 // number of encodes
-        Decode  uint64 // number of decodes
-        Chit    uint64 // number of cache hits
-        Cmiss   uint64 // number of cache misses
-        Size    uint64 // number of sizes
-}
-
-// Set to true to enable stats collection.
-const collectStats = false
-
-var stats Stats
-
-// GetStats returns a copy of the global Stats structure.
-func GetStats() Stats { return stats }
-
 // A Buffer is a buffer manager for marshaling and unmarshaling
 // protocol buffers.  It may be reused between invocations to
 // reduce memory usage.  It is not necessary to use a Buffer;
@@ -960,13 +940,19 @@ func isProto3Zero(v reflect.Value) bool {
         return false
 }
 
-// ProtoPackageIsVersion2 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion2 = true
+const (
+        // ProtoPackageIsVersion3 is referenced from generated protocol buffer files
+        // to assert that that code is compatible with this version of the proto package.
+        ProtoPackageIsVersion3 = true
+
+        // ProtoPackageIsVersion2 is referenced from generated protocol buffer files
+        // to assert that that code is compatible with this version of the proto package.
+        ProtoPackageIsVersion2 = true
 
-// ProtoPackageIsVersion1 is referenced from generated protocol buffer files
-// to assert that that code is compatible with this version of the proto package.
-const ProtoPackageIsVersion1 = true
+        // ProtoPackageIsVersion1 is referenced from generated protocol buffer files
+        // to assert that that code is compatible with this version of the proto package.
+        ProtoPackageIsVersion1 = true
+)
 
 // InternalMessageInfo is a type used internally by generated .pb.go files.
 // This type is not intended to be used by non-generated code.