1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/timeout.rb: Added note about change from #8730 [Fixes GH-440]

Browse Source 
* NEWS: Improve grammar on change to Timeout
  Patched by @srawlins in https://github.com/ruby/ruby/pull/440


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
zzak 2013-11-10 16:05:04 +00:00
parent 5567c5edba
commit 12e20b7c4d
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Nov 11 01:02:06 2013 Zachary Scott <e@zzak.io>
* lib/timeout.rb: Added note about change from #8730 [Fixes GH-440]
* NEWS: Improve grammar on change to Timeout
Patched by @srawlins in https://github.com/ruby/ruby/pull/440
Sun Nov 10 23:47:05 2013 Kazuki Tsujimoto <kazuki@callcc.net> Sun Nov 10 23:47:05 2013 Kazuki Tsujimoto <kazuki@callcc.net>
* gc.c (rb_gcdebug_print_obj_condition): catch up recent changes * gc.c (rb_gcdebug_print_obj_condition): catch up recent changes

2
NEWS
View File

@ -251,7 +251,7 @@ with all sufficient information, see the ChangeLog file.
* Tempfile.create * Tempfile.create
* Timeout * Timeout
* No longer an exception to terminate the given block can be rescued * The exception to terminate the given block can no longer be rescued
inside the block, by default, unless the exception class is given inside the block, by default, unless the exception class is given
explicitly. explicitly.

3
lib/timeout.rb
View File

@ -57,6 +57,9 @@ module Timeout
# Returns the result of the block *if* the block completed before # Returns the result of the block *if* the block completed before
# +sec+ seconds, otherwise throws an exception, based on the value of +klass+. # +sec+ seconds, otherwise throws an exception, based on the value of +klass+.
# #
# The exception thrown to terminate the given block cannot be rescued inside
# the block unless +klass+ is given explicitly.
#
# Note that this is both a method of module Timeout, so you can <tt>include # Note that this is both a method of module Timeout, so you can <tt>include
# Timeout</tt> into your classes so they have a #timeout method, as well as # Timeout</tt> into your classes so they have a #timeout method, as well as
# a module method, so you can call it directly as Timeout.timeout(). # a module method, so you can call it directly as Timeout.timeout().