From e742a446c8864e3988537d06022312c708f9e176 Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 30 Nov 2012 18:47:00 +0000 Subject: * thread.c (Thread.async_interrupt_timing): fix RDoc. :never is not used any more. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ thread.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2aca0600da..7fe367b06f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 1 03:45:47 2012 Koichi Sasada + + * thread.c (Thread.async_interrupt_timing): fix RDoc. + :never is not used any more. + Sat Dec 1 02:56:19 2012 Koichi Sasada * iseq.c: add RubyVM::InstructionSequence (ISeq) inspection methods. diff --git a/thread.c b/thread.c index fa5b1598ab..00529dada5 100644 --- a/thread.c +++ b/thread.c @@ -1585,7 +1585,7 @@ async_interrupt_timing_arg_check_i(VALUE key, VALUE val) * * TODO (DOC): Thread#async_interrupt_timing is stacked. * TODO (DOC): check ancestors. - * TODO (DOC): to prevent all async interrupt, {Object => :never} works. + * TODO (DOC): to prevent all async interrupt, {Object => :defer} works. * * NOTE: Asynchronous interrupts are difficult to use. * If you need to communicate between threads, @@ -1595,7 +1595,7 @@ async_interrupt_timing_arg_check_i(VALUE key, VALUE val) * * # example: Guard from Thread#raise * th = Thread.new do - * Thead.async_interrupt_timing(RuntimeError => :never) { + * Thead.async_interrupt_timing(RuntimeError => :defer) { * begin * # Thread#raise doesn't async interrupt here. * # You can write resource allocation code safely. @@ -1615,7 +1615,7 @@ async_interrupt_timing_arg_check_i(VALUE key, VALUE val) * * # example: Guard from TimeoutError * require 'timeout' - * Thread.async_interrupt_timing(TimeoutError => :never) { + * Thread.async_interrupt_timing(TimeoutError => :defer) { * timeout(10){ * # TimeoutError doesn't occur here * Thread.async_interrupt_timing(TimeoutError => :on_blocking) { @@ -1627,14 +1627,14 @@ async_interrupt_timing_arg_check_i(VALUE key, VALUE val) * } * * # example: Stack control settings - * Thread.async_interrupt_timing(FooError => :never) { - * Thread.async_interrupt_timing(BarError => :never) { + * Thread.async_interrupt_timing(FooError => :defer) { + * Thread.async_interrupt_timing(BarError => :defer) { * # FooError and BarError are prohibited. * } * } * * # example: check ancestors - * Thread.async_interrupt_timing(Exception => :never) { + * Thread.async_interrupt_timing(Exception => :defer) { * # all exceptions inherited from Exception are prohibited. * } * -- cgit v1.2.3