зеркало из https://github.com/github/ruby.git
adjust style and fix typo and indent
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
1b648d0467
Коммит
61f46bafa4
|
@ -1,9 +1,10 @@
|
||||||
Wed Dec 5 04:50:17 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
Wed Dec 5 04:50:17 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||||
|
|
||||||
* lib/timeout.rb (Timeout#timeout): set
|
* lib/timeout.rb (Timeout#timeout): set
|
||||||
async_interrupt_timeing(:on_blocking) by default.
|
async_interrupt_timing(:on_blocking) by default.
|
||||||
[Bug #7503] [ruby-core:50524]
|
[Bug #7503] [ruby-core:50524]
|
||||||
|
|
||||||
* test/test_timeout.rb (#test_timeout_blocking): test for the above.
|
* test/test_timeout.rb (test_timeout_blocking): test for the above.
|
||||||
* test/test_timeout.rb (test_timeout_immediate): ditto
|
* test/test_timeout.rb (test_timeout_immediate): ditto
|
||||||
* test/test_timeout.rb (test_timeout_immediate2): ditto.
|
* test/test_timeout.rb (test_timeout_immediate2): ditto.
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@ module Timeout
|
||||||
# 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().
|
||||||
def timeout(sec, klass = nil, immediate: false) #:yield: +sec+
|
def timeout(sec, klass = nil, immediate: false) #:yield: +sec+
|
||||||
return yield(sec) if sec == nil or sec.zero?
|
return yield(sec) if sec == nil or sec.zero?
|
||||||
Thread.async_interrupt_timing(klass ? klass : ExitException => immediate ? :immediate : :on_blocking) do
|
Thread.async_interrupt_timing(klass ? klass : ExitException => immediate ? :immediate : :on_blocking) do
|
||||||
exception = klass || Class.new(ExitException)
|
exception = klass || Class.new(ExitException)
|
||||||
begin
|
begin
|
||||||
|
|
Загрузка…
Ссылка в новой задаче