From f45e0d537ff0a902f3122eac47b809f3c6098dc4 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 16 Nov 2014 10:11:08 +0000
Subject: timeout.rb: use UncaughtThrowError

* lib/timeout.rb (Timeout::ExitException#exception): rescue
  UncaughtThrowError which is specific for throw, instead of
  ArgumentError.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/timeout.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'lib/timeout.rb')

diff --git a/lib/timeout.rb b/lib/timeout.rb
index d805dce2a3..cf23fb5fb6 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -40,8 +40,7 @@ module Timeout
         bt = caller
         begin
           throw(self, bt)
-        rescue ArgumentError => e
-          raise unless e.message.start_with?("uncaught throw")
+        rescue UncaughtThrowError
           raise Error, message, backtrace
         end
       end
-- 
cgit v1.2.3