diff options
author | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
---|---|---|
committer | Adam Cozzette <acozzette@google.com> | 2018-08-01 13:44:55 -0700 |
commit | 94d55e529204cc8575bf1070dc1e2375dbc8a4c5 (patch) | |
tree | 20730e597f914fd2430c66b9bebe633e017a4fe0 /ruby | |
parent | 3d62db3ecd5377025a458bca827ab4ca12d5c1f0 (diff) | |
parent | 48cb18e5c419ddd23d9badcfe4e9df7bde1979b2 (diff) | |
download | protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.gz protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.tar.bz2 protobuf-94d55e529204cc8575bf1070dc1e2375dbc8a4c5.zip |
Merge branch '3.6.x' into merge-3-6-x
Diffstat (limited to 'ruby')
-rw-r--r-- | ruby/ext/google/protobuf_c/encode_decode.c | 2 | ||||
-rw-r--r-- | ruby/google-protobuf.gemspec | 2 | ||||
-rw-r--r-- | ruby/tests/encode_decode_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ruby/ext/google/protobuf_c/encode_decode.c b/ruby/ext/google/protobuf_c/encode_decode.c index c7a7aa1a..d5842051 100644 --- a/ruby/ext/google/protobuf_c/encode_decode.c +++ b/ruby/ext/google/protobuf_c/encode_decode.c @@ -1109,7 +1109,7 @@ static void putmsg(VALUE msg_rb, const Descriptor* desc, TypedData_Get_Struct(msg_rb, MessageHeader, &Message_type, msg); if (desc != msg->descriptor) { - rb_raise(cTypeError, + rb_raise(rb_eArgError, "The type of given msg is '%s', expect '%s'.", upb_msgdef_fullname(msg->descriptor->msgdef), upb_msgdef_fullname(desc->msgdef)); diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index cc7625d4..00a7ff36 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.6.0" + s.version = "3.6.1" s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." diff --git a/ruby/tests/encode_decode_test.rb b/ruby/tests/encode_decode_test.rb index 95c2cfa4..f8b991cd 100644 --- a/ruby/tests/encode_decode_test.rb +++ b/ruby/tests/encode_decode_test.rb @@ -86,7 +86,7 @@ class EncodeDecodeTest < Test::Unit::TestCase end def test_encode_wrong_msg - e = assert_raise Google::Protobuf::TypeError do + e = assert_raise ::ArgumentError do m = A::B::C::TestMessage.new( :optional_int32 => 1, ) |