usa	2018-01-31 22:52:40 +0900 (Wed, 31 Jan 2018)

  New Revision: 62143

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62143

  Log:
    merge revision(s) 56285: [Backport #14354]
    * thread_sync.c (Init_thread_sync): Remove confusing doc comments,
      which are picked up by rdoc unexpectedly, from Queue and
      SizedQueue.  [Fix GH-1450]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/thread_sync.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/thread_sync.c
===================================================================
--- ruby_2_3/thread_sync.c	(revision 62142)
+++ ruby_2_3/thread_sync.c	(revision 62143)
@@ -1258,11 +1258,11 @@ Init_thread_sync(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread_sync.c#L1258
     rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
     rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
 
-    rb_define_alias(rb_cQueue, "enq", "push");    /* Alias for #push. */
-    rb_define_alias(rb_cQueue, "<<", "push");     /* Alias for #push. */
-    rb_define_alias(rb_cQueue, "deq", "pop");     /* Alias for #pop. */
-    rb_define_alias(rb_cQueue, "shift", "pop");   /* Alias for #pop. */
-    rb_define_alias(rb_cQueue, "size", "length"); /* Alias for #length. */
+    rb_define_alias(rb_cQueue, "enq", "push");
+    rb_define_alias(rb_cQueue, "<<", "push");
+    rb_define_alias(rb_cQueue, "deq", "pop");
+    rb_define_alias(rb_cQueue, "shift", "pop");
+    rb_define_alias(rb_cQueue, "size", "length");
 
     rb_cSizedQueue = rb_struct_define_without_accessor_under(
 	rb_cThread,
@@ -1278,10 +1278,10 @@ Init_thread_sync(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/thread_sync.c#L1278
     rb_define_method(rb_cSizedQueue, "clear", rb_szqueue_clear, 0);
     rb_define_method(rb_cSizedQueue, "num_waiting", rb_szqueue_num_waiting, 0);
 
-    rb_define_alias(rb_cSizedQueue, "enq", "push");  /* Alias for #push. */
-    rb_define_alias(rb_cSizedQueue, "<<", "push");   /* Alias for #push. */
-    rb_define_alias(rb_cSizedQueue, "deq", "pop");   /* Alias for #pop. */
-    rb_define_alias(rb_cSizedQueue, "shift", "pop"); /* Alias for #pop. */
+    rb_define_alias(rb_cSizedQueue, "enq", "push");
+    rb_define_alias(rb_cSizedQueue, "<<", "push");
+    rb_define_alias(rb_cSizedQueue, "deq", "pop");
+    rb_define_alias(rb_cSizedQueue, "shift", "pop");
 
     /* CVar */
     rb_cConditionVariable = rb_struct_define_without_accessor_under(
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 62142)
+++ ruby_2_3/version.h	(revision 62143)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-01-31"
-#define RUBY_PATCHLEVEL 404
+#define RUBY_PATCHLEVEL 405
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 62142)
+++ ruby_2_3/ChangeLog	(revision 62143)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Wed Jan 31 22:51:59 2018  Pete Higgins  <pete@p...>
+
+	* thread_sync.c (Init_thread_sync): Remove confusing doc comments,
+	  which are picked up by rdoc unexpectedly, from Queue and
+	  SizedQueue.  [Fix GH-1450]
+
 Wed Jan 31 22:48:41 2018  Eric Wong  <normalperson@y...>
 
 	thread_pthread.c: do not wakeup inside child processes
Index: ruby_2_3
===================================================================
--- ruby_2_3	(revision 62142)
+++ ruby_2_3	(revision 62143)

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r56285

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/