From b58ee6672d602241a8673c91ca87959cb7222fd4 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 25 Feb 2016 11:00:43 +0000 Subject: merge revision(s) 53784: [Backport #11495] * re.c: Remove deprecated kcode argument from Regexp.new and compile patch provided by Dylan Pulliam [Bug #11495] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53937 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ re.c | 11 ++++------- version.h | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2216dd43ca..41f447e07a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 25 19:58:48 2016 Zachary Scott + + * re.c: Remove deprecated kcode argument from Regexp.new and compile + patch provided by Dylan Pulliam [Bug #11495] + Thu Feb 25 19:49:31 2016 Nobuyoshi Nakada * ext/socket/socket.c (sock_gethostname): support unlimited size diff --git a/re.c b/re.c index bb1a54c3d8..f654160452 100644 --- a/re.c +++ b/re.c @@ -2935,10 +2935,10 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re) /* * call-seq: - * Regexp.new(string, [options [, kcode]]) -> regexp - * Regexp.new(regexp) -> regexp - * Regexp.compile(string, [options [, kcode]]) -> regexp - * Regexp.compile(regexp) -> regexp + * Regexp.new(string, [options]) -> regexp + * Regexp.new(regexp) -> regexp + * Regexp.compile(string, [options) -> regexp + * Regexp.compile(regexp) -> regexp * * Constructs a new regular expression from +pattern+, which can be either a * String or a Regexp (in which case that regexp's options are propagated), @@ -2949,9 +2949,6 @@ rb_reg_match_m(int argc, VALUE *argv, VALUE re) * or-ed together. Otherwise, if +options+ is not * +nil+ or +false+, the regexp will be case insensitive. * - * When the +kcode+ parameter is `n' or `N' sets the regexp no encoding. - * It means that the regexp is for binary strings. - * * r1 = Regexp.new('^a-z+:\\s+\w+') #=> /^a-z+:\s+\w+/ * r2 = Regexp.new('cat', true) #=> /cat/i * r3 = Regexp.new(r2) #=> /cat/i diff --git a/version.h b/version.h index c1953a672d..cede8bbbbf 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 455 +#define RUBY_PATCHLEVEL 456 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 2 -- cgit v1.2.1