diff options
| -rw-r--r-- | string.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 2 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -6262,7 +6262,7 @@ rb_str_byteslice(int argc, VALUE *argv, VALUE str) * bytesplice(index, length, str) -> string * bytesplice(range, str) -> string * - * Replaces some or all of the content of +self+ with +str+, and returns +str+. + * Replaces some or all of the content of +self+ with +str+, and returns +self+. * The portion of the string affected is determined using * the same criteria as String#byteslice, except that +length+ cannot be omitted. * If the replacement string is not the same length as the text it is replacing, @@ -6324,7 +6324,7 @@ rb_str_bytesplice(int argc, VALUE *argv, VALUE str) cr = ENC_CODERANGE_AND(ENC_CODERANGE(str), ENC_CODERANGE(val)); if (cr != ENC_CODERANGE_BROKEN) ENC_CODERANGE_SET(str, cr); - return val; + return str; } /* diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 1ece47b18a..615ede2234 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -3468,7 +3468,7 @@ CODE private def assert_bytesplice_result(expected, s, *args) - assert_equal(args.last, s.send(:bytesplice, *args)) + assert_equal(expected, s.send(:bytesplice, *args)) assert_equal(expected, s) end @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 15 +#define RUBY_PATCHLEVEL 16 #include "ruby/version.h" #include "ruby/internal/abi.h" |