nagachika	2013-03-09 22:45:43 +0900 (Sat, 09 Mar 2013)

  New Revision: 39664

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39664

  Log:
    merge revision(s) 39415:
    
    * array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
      [RubySpec #7803]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/array.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/array.c
===================================================================
--- ruby_2_0_0/array.c	(revision 39663)
+++ ruby_2_0_0/array.c	(revision 39664)
@@ -3801,7 +3801,8 @@ ary_recycle_hash(VALUE hash) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/array.c#L3801
  *  Array Difference
  *
  *  Returns a new array that is a copy of the original array, removing any
- *  items that also appear in +other_ary+.
+ *  items that also appear in +other_ary+. The order is preserved from the
+ *  original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
@@ -3833,7 +3834,8 @@ rb_ary_diff(VALUE ary1, VALUE ary2) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/array.c#L3834
  *     ary & other_ary      -> new_ary
  *
  *  Set Intersection --- Returns a new array containing elements common to the
- *  two arrays, excluding any duplicates.
+ *  two arrays, excluding any duplicates. The order is preserved from the
+ *  original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
@@ -3875,7 +3877,7 @@ rb_ary_and(VALUE ary1, VALUE ary2) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/array.c#L3877
  *     ary | other_ary     -> new_ary
  *
  *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
- *  excluding any duplicates.
+ *  excluding any duplicates and preserving the order from the original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39663)
+++ ruby_2_0_0/ChangeLog	(revision 39664)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Mar  9 22:45:01 2013  Zachary Scott  <zachary@z...>
+
+	* array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
+	  [RubySpec #7803]
+
 Sat Mar  9 22:38:26 2013  Zachary Scott  <zachary@z...>
 
 	* object.c (rb_obj_comp): Documenting Object#<=> return values
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39663)
+++ ruby_2_0_0/version.h	(revision 39664)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-09"
-#define RUBY_PATCHLEVEL 33
+#define RUBY_PATCHLEVEL 34
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39415


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