Merge pull request #5408 from Homebrew/dependabot/bundler/Library/Homebrew/vendor/concurrent-ruby-1.1.4

Bump concurrent-ruby from 1.1.3 to 1.1.4 in /Library/Homebrew/vendor
This commit is contained in:
Mike McQuaid 2018-12-16 19:59:07 +00:00 committed by GitHub
commit 4b56a7d9bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
123 changed files with 6 additions and 15 deletions

View File

@ -8,7 +8,7 @@ GEM
tzinfo (~> 1.1) tzinfo (~> 1.1)
ast (2.4.0) ast (2.4.0)
backports (3.11.4) backports (3.11.4)
concurrent-ruby (1.1.3) concurrent-ruby (1.1.4)
i18n (1.1.1) i18n (1.1.1)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jaro_winkler (1.5.1) jaro_winkler (1.5.1)

View File

@ -3,7 +3,7 @@ require 'rbconfig'
ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby' ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : 'ruby'
ruby_version = RbConfig::CONFIG["ruby_version"] ruby_version = RbConfig::CONFIG["ruby_version"]
path = File.expand_path('..', __FILE__) path = File.expand_path('..', __FILE__)
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/concurrent-ruby-1.1.4/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.1.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/i18n-1.1.1/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.11.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/minitest-5.11.3/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thread_safe-0.3.6/lib"
@ -21,6 +21,6 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/powerpack-0.1.2/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rainbow-3.0.0/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-progressbar-1.10.0/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.4.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unicode-display_width-1.4.0/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.61.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-0.61.1/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.30.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubocop-rspec-1.30.1/lib"
$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.1.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ruby-macho-2.1.0/lib"

View File

@ -20,13 +20,12 @@ if Concurrent.on_jruby?
def initialize(*args, &block) def initialize(*args, &block)
super super
ns_make_executor_runnable
end end
def post(*args, &task) def post(*args, &task)
raise ArgumentError.new('no block given') unless block_given? raise ArgumentError.new('no block given') unless block_given?
return handle_fallback(*args, &task) unless running? return handle_fallback(*args, &task) unless running?
@executor.submit_runnable Job.new(args, task) @executor.submit Job.new(args, task)
true true
rescue Java::JavaUtilConcurrent::RejectedExecutionException rescue Java::JavaUtilConcurrent::RejectedExecutionException
raise RejectedExecutionError raise RejectedExecutionError
@ -75,14 +74,6 @@ if Concurrent.on_jruby?
@executor.isShutdown || @executor.isTerminated @executor.isShutdown || @executor.isTerminated
end end
def ns_make_executor_runnable
if !defined?(@executor.submit_runnable)
@executor.class.class_eval do
java_alias :submit_runnable, :submit, [java.lang.Runnable.java_class]
end
end
end
class Job class Job
include Runnable include Runnable
def initialize(args, block) def initialize(args, block)

View File

@ -138,7 +138,7 @@ module Concurrent
end end
unless name.nil? unless name.nil?
begin begin
parent.send :remove_const, name if parent.const_defined? name parent.send :remove_const, name if parent.const_defined?(name, false)
parent.const_set(name, clazz) parent.const_set(name, clazz)
clazz clazz
rescue NameError rescue NameError

Some files were not shown because too many files have changed in this diff Show More