summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--enum.c9
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c004465000..56dbe69eca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 25 08:51:39 2012 Eric Hodel <drbrain@segment7.net>
+
+ * enum.c (enum_count): Enumerable#count no longer uses #size when
+ counting elements. Patch by Nobuhiro IMAI. [ruby-trunk - Bug #6473]
+
Fri May 25 01:15:39 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (ruby__sfvextra): [EXPERIMENTAL] use inspect instead of
diff --git a/enum.c b/enum.c
index 9e999a8f51..ae25c554ab 100644
--- a/enum.c
+++ b/enum.c
@@ -130,11 +130,10 @@ count_all_i(VALUE i, VALUE memop, int argc, VALUE *argv)
* enum.count(item) -> int
* enum.count { |obj| block } -> int
*
- * Returns the number of items in <i>enum</i> if it responds to a #size call,
- * otherwise the items are counted through enumeration. If an argument is
- * given the number of items in <i>enum</i> that are equal to <i>item</i> are
- * counted. If a block is given, it counts the number of elements yielding a
- * true value.
+ * Returns the number of items in +enum+ through enumeration.
+ * If an argument is given, the number of items in +enum+ that
+ * are equal to +item+ are counted. If a block is given, it
+ * counts the number of elements yielding a true value.
*
* ary = [1, 2, 4, 2]
* ary.count #=> 4