* io.c (read_all): should use io_read_encoding(), not

  io_input_encoding().

* io.c (rb_io_getline_1): reduce calling of io_read_encoding().

* string.c (rb_str_scan): need not to restore $~ value, so avoid
  pinning match object.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 3 deletions

diff --git a/string.c b/string.c
index ef54b7e459..d123207fd4 100644
--- a/string.c
+++ b/string.c
@@ -5705,11 +5705,8 @@ rb_str_scan(VALUE str, VALUE pat)
     }
 
     while (!NIL_P(result = scan_once(str, pat, &start))) {
-	match = rb_backref_get();
-	rb_match_busy(match);
 	rb_yield(result);
 	str_mod_check(str, p, len);
-	rb_backref_set(match);	/* restore $~ value */
     }
     rb_backref_set(match);
     return str;