archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 2f1895fa15: [Backport #16767]

Browse source 
Fixed formatted substring expansion [Bug #16767]
This commit is contained in:
nagachika 2020-07-25 11:56:28 +09:00
parent c65aae118c
commit 2e9626fddd
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
strftime.c
View file

@ -326,7 +326,9 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
s += len; \
if (i > 0) case_conv(s, i, flags); \
if (precision > i) {\
s += i; \
NEEDS(precision); \
s -= i; \
memmove(s + precision - i, s, i);\
memset(s, padding ? padding : ' ', precision - i); \
s += precision; \

7
test/ruby/test_time.rb
View file

@ -885,6 +885,13 @@ class TestTime < Test::Unit::TestCase
assert_equal(8192, Time.now.strftime('%8192z').size)
end
def test_strftime_wide_precision
t2000 = get_t2000
s = t2000.strftime("%28c")
assert_equal(28, s.size)
assert_equal(t2000.strftime("%c"), s.strip)
end
def test_strfimte_zoneoffset
t2000 = get_t2000
t = t2000.getlocal("+09:00:00")

4
version.h
View file

@ -2,11 +2,11 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 107
#define RUBY_PATCHLEVEL 108
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 23
#define RUBY_RELEASE_DAY 25
#include "ruby/version.h"