1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* array.c (rb_ary_nitems, rb_ary_choice): Add a deprecation

warning.

* hash.c (env_index, rb_hash_index): Simplify the deprecation
  warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@20783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-12-16 08:15:21 +00:00
parent 9a0b0747be
commit 0c6fdc530b
3 changed files with 14 additions and 2 deletions

View file

@ -1,3 +1,11 @@
Tue Dec 16 17:14:01 2008 Akinori MUSHA <knu@iDaemons.org>
* array.c (rb_ary_nitems, rb_ary_choice): Add a deprecation
warning.
* hash.c (env_index, rb_hash_index): Simplify the deprecation
warnings.
Mon Dec 15 18:53:17 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed.

View file

@ -3067,6 +3067,8 @@ rb_ary_nitems(ary)
long n = 0;
VALUE *p, *pend;
rb_warn("Array#nitems is deprecated; use Array#count { |i| !i.nil? }");
for (p = RARRAY(ary)->ptr, pend = p + RARRAY(ary)->len; p < pend; p++) {
if (!NIL_P(*p)) n++;
}
@ -3363,6 +3365,8 @@ rb_ary_choice(ary)
{
long i, j;
rb_warn("Array#choice is deprecated; use Array#sample");
i = RARRAY(ary)->len;
if (i == 0) return Qnil;
j = rb_genrand_real()*i;

4
hash.c
View file

@ -705,7 +705,7 @@ static VALUE
rb_hash_index(hash, value)
VALUE hash, value;
{
rb_warning("Hash#index is deprecated and will be removed in 1.9; use Hash#key");
rb_warning("Hash#index is deprecated; use Hash#key");
return rb_hash_key(hash, value);
}
@ -2484,7 +2484,7 @@ static VALUE
env_index(dmy, value)
VALUE dmy, value;
{
rb_warning("ENV.index is deprecated and will be removed in 1.9; use ENV.key");
rb_warning("ENV.index is deprecated; use ENV.key");
return env_key(dmy, value);
}