summaryrefslogtreecommitdiff
path: root/array.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-27 15:44:36 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-27 15:44:36 +0000
commit41fd33e5fe22f13fd178c50adaee39ce53a3c155 (patch)
tree210ffad3a18390857eb4aa95252358eed22ab487 /array.c
parentcd0a89b0931d51015e4e94b010926f0c75767cee (diff)
merge revision(s) r45562: [Backport #9727]
* array.c (ary_reject): may be turned into a shared array during the given block. [ruby-dev:48101] [Bug #9727] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r--array.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/array.c b/array.c
index d780f43810..a57733866e 100644
--- a/array.c
+++ b/array.c
@@ -903,19 +903,6 @@ rb_ary_push(VALUE ary, VALUE item)
return ary;
}
-static VALUE
-rb_ary_push_1(VALUE ary, VALUE item)
-{
- long idx = RARRAY_LEN(ary);
-
- if (idx >= ARY_CAPA(ary)) {
- ary_double_capa(ary, idx);
- }
- RARRAY_ASET(ary, idx, item);
- ARY_SET_LEN(ary, idx + 1);
- return ary;
-}
-
VALUE
rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
{
@@ -3082,7 +3069,7 @@ ary_reject(VALUE orig, VALUE result)
for (i = 0; i < RARRAY_LEN(orig); i++) {
VALUE v = RARRAY_AREF(orig, i);
if (!RTEST(rb_yield(v))) {
- rb_ary_push_1(result, v);
+ rb_ary_push(result, v);
}
}
return result;