summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-27 02:10:29 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-27 02:10:29 +0000
commit8fc8d598c9b44db3a9d149c7a927abac49c36aeb (patch)
treeafe7ecda35ba9c4271dfd0c7911cf4c8faf64206
parente2eae5372c3ed54e454c6a5fbf1da19ec8251596 (diff)
* array.c (rb_ary_collect), enum.c (enum_collect): rb_warn() is a
bit too noisy when RubyGems, so change it to rb_warning(). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@39959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--array.c4
-rw-r--r--enum.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 882bce1b4b..c30cf930d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 27 11:09:17 2013 Akinori MUSHA <knu@iDaemons.org>
+
+ * array.c (rb_ary_collect), enum.c (enum_collect): rb_warn() is a
+ bit too noisy when RubyGems, so change it to rb_warning().
+
Sun Feb 24 02:03:14 2013 Tanaka Akira <akr@fsij.org>
* configure.in: Minix 3.2.1 supports shared libraries as NetBSD.
diff --git a/array.c b/array.c
index c63899479a..ca508f371c 100644
--- a/array.c
+++ b/array.c
@@ -1902,8 +1902,8 @@ rb_ary_collect(ary)
VALUE collect;
if (!rb_block_given_p()) {
- rb_warn("Array#%s without a block does not return an array in 1.9 and later",
- rb_id2name(rb_frame_last_func()));
+ rb_warning("Array#%s without a block does not return an array in 1.9 and later",
+ rb_id2name(rb_frame_last_func()));
return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
}
diff --git a/enum.c b/enum.c
index 50b34ef16c..221f95f505 100644
--- a/enum.c
+++ b/enum.c
@@ -431,8 +431,8 @@ enum_collect(obj)
VALUE ary = rb_ary_new();
if (!rb_block_given_p()) {
- rb_warn("Enumerable#%s without a block does not return an array in 1.9 and later",
- rb_id2name(rb_frame_last_func()));
+ rb_warning("Enumerable#%s without a block does not return an array in 1.9 and later",
+ rb_id2name(rb_frame_last_func()));
rb_iterate(rb_each, obj, collect_all, ary);
}
else {