From b5e22aa1d69e5d1b5f84c929977635f835d80271 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 22 Jan 2015 02:47:44 +0000 Subject: [PATCH] merge revision(s) 49056: [Backport #10671] * doc/syntax/literals.rdoc (Symbols): now Symbols created by interpolation can be garbage collected. patch by Yihang Ho in [ruby-core:67194]. [Bug #10671] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ doc/syntax/literals.rdoc | 3 --- version.h | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9aaf7609be..0e1c4617dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 22 11:47:31 2015 Nobuyoshi Nakada + + * doc/syntax/literals.rdoc (Symbols): now Symbols created by + interpolation can be garbage collected. patch by Yihang Ho in + [ruby-core:67194]. [Bug #10671] + Thu Jan 22 11:45:32 2015 Kazuki Tsujimoto * eval_intern.h, vm.c, vm_eval.c, vm_insnhelper.c: diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc index 32e10edd30..194945abbd 100644 --- a/doc/syntax/literals.rdoc +++ b/doc/syntax/literals.rdoc @@ -199,9 +199,6 @@ You may also create symbols by interpolation: :"my_symbol1" :"my_symbol#{1 + 1}" -Note that symbols are never garbage collected so be careful when referencing -symbols using interpolation. - Like strings, a single-quote may be used to disable interpolation: :'my_symbol#{1 + 1}' #=> :"my_symbol\#{1 + 1}" diff --git a/version.h b/version.h index cc365c9ecd..cf552cecce 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-01-22" -#define RUBY_PATCHLEVEL 35 +#define RUBY_PATCHLEVEL 36 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1