| Index: third_party/protobuf/src/google/protobuf/any.proto
|
| diff --git a/third_party/protobuf/src/google/protobuf/any.proto b/third_party/protobuf/src/google/protobuf/any.proto
|
| index 45db6ede352bb2af940675b63476b15554309951..9bd3f50a4537c107d87b719dbf12ab0d93874b17 100644
|
| --- a/third_party/protobuf/src/google/protobuf/any.proto
|
| +++ b/third_party/protobuf/src/google/protobuf/any.proto
|
| @@ -37,7 +37,6 @@ option go_package = "github.com/golang/protobuf/ptypes/any";
|
| option java_package = "com.google.protobuf";
|
| option java_outer_classname = "AnyProto";
|
| option java_multiple_files = true;
|
| -option java_generate_equals_and_hash = true;
|
| option objc_class_prefix = "GPB";
|
|
|
| // `Any` contains an arbitrary serialized protocol buffer message along with a
|
| @@ -65,6 +64,16 @@ option objc_class_prefix = "GPB";
|
| // foo = any.unpack(Foo.class);
|
| // }
|
| //
|
| +// Example 3: Pack and unpack a message in Python.
|
| +//
|
| +// foo = Foo(...)
|
| +// any = Any()
|
| +// any.Pack(foo)
|
| +// ...
|
| +// if any.Is(Foo.DESCRIPTOR):
|
| +// any.Unpack(foo)
|
| +// ...
|
| +//
|
| // The pack methods provided by protobuf library will by default use
|
| // 'type.googleapis.com/full.type.name' as the type URL and the unpack
|
| // methods only use the fully qualified type name after the last '/'
|
| @@ -104,10 +113,10 @@ message Any {
|
| // A URL/resource name whose content describes the type of the
|
| // serialized protocol buffer message.
|
| //
|
| - // For URLs which use the schema `http`, `https`, or no schema, the
|
| + // For URLs which use the scheme `http`, `https`, or no scheme, the
|
| // following restrictions and interpretations apply:
|
| //
|
| - // * If no schema is provided, `https` is assumed.
|
| + // * If no scheme is provided, `https` is assumed.
|
| // * The last segment of the URL's path must represent the fully
|
| // qualified name of the type (as in `path/google.protobuf.Duration`).
|
| // The name should be in a canonical form (e.g., leading "." is
|
| @@ -120,7 +129,7 @@ message Any {
|
| // on changes to types. (Use versioned type names to manage
|
| // breaking changes.)
|
| //
|
| - // Schemas other than `http`, `https` (or the empty schema) might be
|
| + // Schemes other than `http`, `https` (or the empty scheme) might be
|
| // used with implementation specific semantics.
|
| //
|
| string type_url = 1;
|
|
|