Remove unnecessary require 'thread'

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
akkyta · Oct 8, 2017 · 6064132 · 6064132
1 parent 838a916
commit 6064132
Show file tree

Hide file tree

Showing 47 changed files with 2 additions and 65 deletions.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
@@ -47,7 +47,6 @@
 #   Translation of presentation on Ruby by Masatoshi Seki.
 
 require 'socket'
-require 'thread'
 require 'io/wait'
 require 'drb/eq'
 

diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
@@ -5,7 +5,6 @@
 =end
 
 require 'drb/drb'
-require 'thread'
 require 'monitor'
 
 module DRb

diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb
@@ -10,7 +10,6 @@
 #
 #
 IRB.fail CantShiftToMultiIrbMode unless defined?(Thread)
-require "thread"
 
 module IRB
   class JobManager

diff --git a/lib/irb/workspace.rb b/lib/irb/workspace.rb
@@ -39,8 +39,6 @@ def initialize(*main)
 
         when 2	# binding in loaded file(thread use)
           unless defined? BINDING_QUEUE
-            require "thread"
-
             IRB.const_set(:BINDING_QUEUE, Thread::SizedQueue.new(1))
             Thread.abort_on_exception = true
             Thread.start do

diff --git a/lib/monitor.rb b/lib/monitor.rb
@@ -7,8 +7,6 @@
 # You can freely distribute/modify this library.
 #
 
-require 'thread'
-
 #
 # In concurrent programming, a monitor is an object or module intended to be
 # used safely by more than one thread.  The defining characteristic of a

diff --git a/lib/mutex_m.rb b/lib/mutex_m.rb
@@ -10,9 +10,6 @@
 #
 # --
 
-
-require 'thread'
-
 # = mutex_m.rb
 #
 # When 'mutex_m' is required, any object that extends or includes Mutex_m will

diff --git a/lib/rinda/rinda.rb b/lib/rinda/rinda.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'drb/drb'
-require 'thread'
 
 ##
 # A module to implement the Linda distributed computing paradigm in Ruby.

diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
@@ -4,7 +4,6 @@
 #
 require 'drb/drb'
 require 'rinda/rinda'
-require 'thread'
 require 'ipaddr'
 
 module Rinda

diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'monitor'
-require 'thread'
 require 'drb/drb'
 require 'rinda/rinda'
 require 'forwardable'

diff --git a/lib/shell/command-processor.rb b/lib/shell/command-processor.rb
@@ -11,7 +11,6 @@
 #
 
 require "e2mmap"
-require "thread"
 
 require "shell/error"
 require "shell/filter"

diff --git a/lib/shell/process-controller.rb b/lib/shell/process-controller.rb
@@ -10,8 +10,6 @@
 #
 #
 require "forwardable"
-
-require "thread"
 require "sync"
 
 class Shell

diff --git a/lib/singleton.rb b/lib/singleton.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: false
-require 'thread'
 
 # The Singleton module implements the Singleton pattern.
 #

diff --git a/lib/thwait.rb b/lib/thwait.rb
@@ -5,7 +5,6 @@
 #       $Revision: 1.3 $
 #       by Keiju ISHITSUKA(Nihon Rational Software Co.,Ltd.)
 
-require "thread.rb"
 require "e2mmap.rb"
 
 #

diff --git a/lib/tracer.rb b/lib/tracer.rb
@@ -2,7 +2,6 @@
 #--
 # $Release Version: 0.3$
 # $Revision: 1.12 $
-require "thread"
 
 ##
 # Outputs a source level execution trace of a Ruby program.

diff --git a/lib/webrick/httpservlet/abstract.rb b/lib/webrick/httpservlet/abstract.rb
@@ -9,8 +9,6 @@
 #
 # $IPR: abstract.rb,v 1.24 2003/07/11 11:16:46 gotoyuzo Exp $
 
-require 'thread'
-
 require 'webrick/htmlutils'
 require 'webrick/httputils'
 require 'webrick/httpstatus'

diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
@@ -9,7 +9,6 @@
 #
 # $IPR: filehandler.rb,v 1.44 2003/06/07 01:34:51 gotoyuzo Exp $
 
-require 'thread'
 require 'time'
 
 require 'webrick/htmlutils'

diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
@@ -9,7 +9,6 @@
 #
 # $IPR: server.rb,v 1.62 2003/07/22 19:20:43 gotoyuzo Exp $
 
-require 'thread'
 require 'socket'
 require 'webrick/config'
 require 'webrick/log'

diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb
@@ -91,7 +91,6 @@ def random_string(len)
 
     ###########
 
-    require "thread"
     require "timeout"
     require "singleton"
 

diff --git a/sample/drb/dchats.rb b/sample/drb/dchats.rb
@@ -2,7 +2,6 @@
  distributed Ruby --- chat server
  	Copyright (c) 1999-2000 Masatoshi SEKI
 =end
-require 'thread'
 require 'drb/drb'
 
 class ChatEntry

diff --git a/sample/drb/dhasen.rb b/sample/drb/dhasen.rb
@@ -17,7 +17,6 @@
 
 require 'drb/drb'
 require 'chasen'
-require 'thread'
 
 class Dhasen
   include DRbUndumped

diff --git a/sample/drb/dlogd.rb b/sample/drb/dlogd.rb
@@ -4,7 +4,6 @@
 =end
 
 require 'drb/drb'
-require 'thread'
 
 class Logger
   def initialize(fname)

diff --git a/sample/drb/dqueue.rb b/sample/drb/dqueue.rb
@@ -3,7 +3,6 @@
  	Copyright (c) 1999-2000 Masatoshi SEKI
 =end
 
-require 'thread'
 require 'drb/drb'
 
 DRb.start_service(nil, Thread::Queue.new)

diff --git a/sample/drb/http0serv.rb b/sample/drb/http0serv.rb
@@ -1,7 +1,6 @@
 require 'webrick'
 require 'drb/drb'
 require 'drb/http0'
-require 'thread'
 
 module DRb
   module HTTP0

diff --git a/sample/drb/name.rb b/sample/drb/name.rb
@@ -35,7 +35,6 @@
  | 2
 =end
 
-require 'thread.rb'
 require 'drb/drb'
 
 module DRbNamedObject

diff --git a/sample/drb/old_tuplespace.rb b/sample/drb/old_tuplespace.rb
@@ -3,8 +3,6 @@
 # Copyright (c) 1999-2000 Masatoshi SEKI
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'thread'
-
 class TupleSpace
   class Template
     def initialize(list)

diff --git a/sample/drb/ring_echo.rb b/sample/drb/ring_echo.rb
@@ -1,7 +1,6 @@
 require 'drb/drb'
 require 'drb/eq'
 require 'rinda/ring'
-require 'thread'
 
 class RingEcho
   include DRbUndumped

diff --git a/sample/drb/simpletuple.rb b/sample/drb/simpletuple.rb
@@ -3,8 +3,6 @@
 # Copyright (c) 1999-2000 Masatoshi SEKI
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
-require 'thread'
-
 class SimpleTupleSpace
   def initialize
     @hash = {}

diff --git a/sample/dualstack-httpd.rb b/sample/dualstack-httpd.rb
@@ -3,7 +3,6 @@
 # The code demonstrates how a multi-protocol daemon should be written.
 
 require "socket"
-require "thread"
 
 port = 8888
 res = Socket.getaddrinfo(nil, port, nil, Socket::SOCK_STREAM, nil, Socket::AI_PASSIVE)

diff --git a/sample/observ.rb b/sample/observ.rb
@@ -1,6 +1,5 @@
 #! /usr/local/bin/ruby
 
-require "thread"
 require "observer"
 
 class Tick

diff --git a/sample/philos.rb b/sample/philos.rb
@@ -1,7 +1,6 @@
 #
 # The Dining Philosophers - thread example
 #
-require "thread"
 
 srand
 #srand

diff --git a/test/-ext-/postponed_job/test_postponed_job.rb b/test/-ext-/postponed_job/test_postponed_job.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 require '-test-/postponed_job'
 
 module Bug

diff --git a/test/bigdecimal/test_bigdecimal.rb b/test/bigdecimal/test_bigdecimal.rb
@@ -2,8 +2,6 @@
 require_relative "testbase"
 require 'bigdecimal/math'
 
-require 'thread'
-
 class TestBigDecimal < Test::Unit::TestCase
   include TestBigDecimalBase
 

diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
@@ -452,8 +452,7 @@ def _run_parallel suites, type, result
           return
         end
 
-        # Require needed things for parallel running
-        require 'thread'
+        # Require needed thing for parallel running
         require 'timeout'
         @tasks = @files.dup # Array of filenames.
         @need_quit = false

diff --git a/test/monitor/test_monitor.rb b/test/monitor/test_monitor.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require "monitor"
-require "thread"
 
 require "test/unit"
 

diff --git a/test/ruby/lbtest.rb b/test/ruby/lbtest.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: false
-require 'thread'
 
 class LocalBarrier
   def initialize(n)

diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
 require 'tempfile'
-require 'thread'
 
 class TestAutoload < Test::Unit::TestCase
   def test_autoload_so

diff --git a/test/ruby/test_backtrace.rb b/test/ruby/test_backtrace.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 require 'tempfile'
 
 class TestBacktrace < Test::Unit::TestCase

diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
 require 'tempfile'
-require "thread"
 require "-test-/file"
 require_relative 'ut_eof'
 

diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb
@@ -1,7 +1,6 @@
 # -*- coding: us-ascii -*-
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 
 class TestThread < Test::Unit::TestCase
   class Thread < ::Thread
@@ -966,7 +965,6 @@ def test_thread_join_main_thread
 
   def test_main_thread_status_at_exit
     assert_in_out_err([], <<-'INPUT', ["false false aborting"], [])
-require 'thread'
 q = Thread::Queue.new
 Thread.new(Thread.current) {|mth|
   begin

diff --git a/test/ruby/test_threadgroup.rb b/test/ruby/test_threadgroup.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 
 class TestThreadGroup < Test::Unit::TestCase
   def test_thread_init

diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
@@ -9,7 +9,6 @@
 require "tempfile"
 require "timeout"
 require "tmpdir"
-require "thread"
 require "io/nonblock"
 
 class TestSocket_UNIXSocket < Test::Unit::TestCase

diff --git a/test/test_mutex_m.rb b/test/test_mutex_m.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 require 'mutex_m'
 
 class TestMutexM < Test::Unit::TestCase

diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 require 'test/unit'
 require 'tempfile'
-require 'thread'
 
 class TestTempfile < Test::Unit::TestCase
   def initialize(*)

diff --git a/test/test_timeout.rb b/test/test_timeout.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: false
 require 'test/unit'
 require 'timeout'
-require 'thread'
 
 class TestTimeout < Test::Unit::TestCase
   def test_queue

diff --git a/test/thread/test_cv.rb b/test/thread/test_cv.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 require 'tmpdir'
 
 class TestConditionVariable < Test::Unit::TestCase
@@ -94,8 +93,6 @@ def test_condvar_wait_and_broadcast
 
   def test_condvar_wait_deadlock
     assert_in_out_err([], <<-INPUT, /\Afatal\nNo live threads left\. Deadlock/, [])
-      require "thread"
-
       mutex = Mutex.new
       cv = ConditionVariable.new
 

diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: false
 require 'test/unit'
-require 'thread'
 require 'tmpdir'
 require 'timeout'
 
@@ -136,7 +135,6 @@ def test_thr_kill
       total_count = 250
       begin
         assert_normal_exit(<<-"_eom", bug5343, {:timeout => timeout, :chdir=>d})
-          require "thread"
           #{total_count}.times do |i|
             open("test_thr_kill_count", "w") {|f| f.puts i }
             queue = Queue.new
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,9 +10,6 @@ @@
     #
     # --
-    require 'thread'
     # = mutex_m.rb
     #
     # When 'mutex_m' is required, any object that extends or includes Mutex_m will
@@ Expand Down @@