summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorst0012 <stan001212@gmail.com>2022-10-02 10:20:26 +0100
committergit <svn-admin@ruby-lang.org>2022-10-03 07:00:53 +0900
commitb97e909ef476a6facbaec665a205fee486371044 (patch)
treec1c05c1c72aeb2836456aaa1bb41e16021a4ac66
parent7b88ffb34fc995d7499fd9ed384cf7f5ba12994e (diff)
[ruby/irb] Remove unnecessary Thread presence check
They were introduced around 20 years ago, when Thread is not yet stabilized. So we don't need them anymore. https://github.com/ruby/irb/commit/4c75e03b2b
-rw-r--r--lib/irb.rb6
-rw-r--r--lib/irb/context.rb2
-rw-r--r--lib/irb/ext/multi-irb.rb1
3 files changed, 2 insertions, 7 deletions
diff --git a/lib/irb.rb b/lib/irb.rb
index 9a3a491641..0c145069c0 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -389,11 +389,7 @@ module IRB
#
# Will raise an Abort exception, or the given +exception+.
def IRB.irb_abort(irb, exception = Abort)
- if defined? Thread
- irb.context.thread.raise exception, "abort then interrupt!"
- else
- raise exception, "abort then interrupt!"
- end
+ irb.context.thread.raise exception, "abort then interrupt!"
end
class Irb
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index b74cae1223..a3b7dda8cd 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -32,7 +32,7 @@ module IRB
else
@workspace = WorkSpace.new
end
- @thread = Thread.current if defined? Thread
+ @thread = Thread.current
# copy of default configuration
@ap_name = IRB.conf[:AP_NAME]
diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
index 74de1ecde5..e57d43a569 100644
--- a/lib/irb/ext/multi-irb.rb
+++ b/lib/irb/ext/multi-irb.rb
@@ -9,7 +9,6 @@
#
#
#
-fail CantShiftToMultiIrbMode unless defined?(Thread)
module IRB
class JobManager