aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--doc/re.rdoc3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c45f46420..257f3a802b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jun 2 06:34:15 2012 Eric Hodel <drbrain@segment7.net>
+
+ * doc/re.rdoc (Performance): Removed useless sample output from final
+ performance example and switched from #match to #=~ for consistency.
+ [ruby-trunk - Bug #6524]
+
Fri Jun 1 09:30:53 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (class_or_module_required): extract check for class or
diff --git a/doc/re.rdoc b/doc/re.rdoc
index 4e943571a8..a357d5c323 100644
--- a/doc/re.rdoc
+++ b/doc/re.rdoc
@@ -644,6 +644,5 @@ One approach for improving performance is to anchor the match to the
beginning of the string, thus significantly reducing the amount of
backtracking needed.
- Regexp.new('\A' 'a?' * 29 + 'a' * 29).match('a' * 29)
- #=> #<MatchData "aaaaaaaaaaaaaaaaaaaaaaaaaaaaa">
+ Regexp.new('\A' 'a?' * 29 + 'a' * 29) =~ 'a' * 29