merge revision(s) 54231: [Backport ruby#12121]

unak · unak · commit b3f1ffd79bc8 · 2016-03-25T09:42:52.000Z
* variable.c: Added documentation about order of `Module#constants` [ci skip][Bug ruby#12121][ruby-dev:49505][fix rubyGH-1301] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar 25 18:42:46 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* variable.c: Added documentation about order of `Module#constants`
+	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
+
 Fri Mar 25 18:41:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (enc_succ_alnum_char): try to skip an invalid character
diff --git a/variable.c b/variable.c
@@ -2058,6 +2058,9 @@ rb_const_list(void *data)
  *  modules (example at start of section), unless the <i>inherit</i>
  *  parameter is set to <code>false</code>.
  *
+ *  The implementation makes no guarantees about the order in which the
+ *  constants are yielded.
+ *
  *    IO.constants.include?(:SYNC)        #=> true
  *    IO.constants(false).include?(:SYNC) #=> false
  *
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.9"
 #define RUBY_RELEASE_DATE "2016-03-25"
-#define RUBY_PATCHLEVEL 482
+#define RUBY_PATCHLEVEL 483
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3

Original file line number	Diff line number	Diff line change
`@@ -2058,6 +2058,9 @@ rb_const_list(void *data)`
`2058`	`2058`	`* modules (example at start of section), unless the <i>inherit</i>`
`2059`	`2059`	`* parameter is set to <code>false</code>.`
`2060`	`2060`	`*`
	`2061`	`+ * The implementation makes no guarantees about the order in which the`
	`2062`	`+ * constants are yielded.`
	`2063`	`+ *`
`2061`	`2064`	`* IO.constants.include?(:SYNC) #=> true`
`2062`	`2065`	`* IO.constants(false).include?(:SYNC) #=> false`
`2063`	`2066`	`*`