1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

remove garbages.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-09-20 07:06:06 +00:00
parent a9fefe7555
commit 2b64e10feb
4 changed files with 4 additions and 7 deletions

View file

@ -1,17 +1,14 @@
<<<<<<< .mine
Thu Sep 20 10:56:08 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* test/drb/ut_drb.rb: revert a part of r36987, and get rid of a warning
with another method. if the substitution is removed, the ExtSrv
object will be GC'ed and some tests will be blocked.
=======
Thu Sep 20 10:30:00 2012 Zachary Scott <zzak@ruby-lang.org>
* lib/find.rb: Error in documentation example
Found by Herwin Weststrate, thank you!
>>>>>>> .r36994
Thu Sep 20 07:20:00 2012 Zachary Scott <zzak@ruby-lang.org>
* complex.c: Examples for Complex Documentation.
@ -26,7 +23,7 @@ Thu Sep 20 07:15:00 2012 Zachary Scott <zzak@ruby-lang.org>
Thu Sep 20 07:05:00 2012 Zachary Scott <zzak@ruby-lang.org>
* lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv):
* lib/csv.rb (Object#CSV, Array#to_csv, String#parse_csv):
Examples and documentation for CSV.
[Bug #6880] [ruby-core:47218]

View file

@ -3528,7 +3528,7 @@ ary_recycle_hash(VALUE hash)
* Returns a new array that is a copy of the original array, removing any
* items that also appear in +other_ary+.
*
* It compares elements using their hash (returned by the Object#hash method).
* It compares elements using their hash (returned by the Object#hash method).
*
* [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ] #=> [ 3, 3, 5 ]
*

View file

@ -440,7 +440,7 @@ nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
* Complex.rectangular(real[, imag]) -> complex
*
* Returns a complex object which denotes the given rectangular form.
*
*
* For example:
* Complex.rect(12, 2) # => (12+2i)
* Complex.rect(0, 17) # => (0+17i)

View file

@ -2373,7 +2373,7 @@ end
#
# CSV("CSV,data") { |c|
# c.read.any? { |a| a.include?("zombies") }
# } #=> false
# } #=> false
#
def CSV(*args, &block)
CSV.instance(*args, &block)