Merge pull request #19114 from Homebrew/dependabot/bundler/Library/Ho…

…mebrew/concurrent-ruby-1.3.5 build(deps): bump concurrent-ruby from 1.3.4 to 1.3.5 in /Library/Homebrew
Homebrew · Jan 18, 2025 · 637fd5b · 637fd5b
2 parents 0645117 + 1132d0e
commit 637fd5b
Show file tree

Hide file tree

Showing 122 changed files with 78 additions and 61 deletions.
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     bigdecimal (3.1.9)
     bindata (2.5.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     diff-lcs (1.5.1)
     docile (1.4.1)
     elftools (1.3.1)

diff --git a/...sorbet/rbi/gems/[email protected] → ...sorbet/rbi/gems/[email protected] b/...sorbet/rbi/gems/[email protected] → ...sorbet/rbi/gems/[email protected]
diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -43,7 +43,7 @@ def self.extension_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bigdecimal-3.1.9/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/bindata-2.5.0/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/coderay-1.1.3/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/concurrent-ruby-1.3.4/lib/concurrent-ruby")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/concurrent-ruby-1.3.5/lib/concurrent-ruby")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/diff-lcs-1.5.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/docile-1.4.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/elftools-1.3.1/lib")

diff --git a/.../ruby/3.3.0/gems/concurrent-ruby-1.3.4/lib/concurrent-ruby/concurrent/concurrent_ruby.jar b/.../ruby/3.3.0/gems/concurrent-ruby-1.3.4/lib/concurrent-ruby/concurrent/concurrent_ruby.jar
diff --git a/....0/gems/concurrent-ruby-1.3.4/LICENSE.txt → ....0/gems/concurrent-ruby-1.3.5/LICENSE.txt b/....0/gems/concurrent-ruby-1.3.4/LICENSE.txt → ....0/gems/concurrent-ruby-1.3.5/LICENSE.txt
diff --git a/....4/lib/concurrent-ruby/concurrent-ruby.rb → ....5/lib/concurrent-ruby/concurrent-ruby.rb b/....4/lib/concurrent-ruby/concurrent-ruby.rb → ....5/lib/concurrent-ruby/concurrent-ruby.rb
diff --git a/...y-1.3.4/lib/concurrent-ruby/concurrent.rb → ...y-1.3.5/lib/concurrent-ruby/concurrent.rb b/...y-1.3.4/lib/concurrent-ruby/concurrent.rb → ...y-1.3.5/lib/concurrent-ruby/concurrent.rb
diff --git a/...4/lib/concurrent-ruby/concurrent/agent.rb → ...5/lib/concurrent-ruby/concurrent/agent.rb b/...4/lib/concurrent-ruby/concurrent/agent.rb → ...5/lib/concurrent-ruby/concurrent/agent.rb
@@ -371,7 +371,7 @@ def await_for(timeout)
     # @param [Float] timeout the maximum number of seconds to wait
     # @return [Boolean] true if all actions complete before timeout
     #
-    # @raise [Concurrent::TimeoutError] when timout is reached
+    # @raise [Concurrent::TimeoutError] when timeout is reached
     #
     # @!macro agent_await_warning
     def await_for!(timeout)
@@ -477,7 +477,7 @@ def await_for(timeout, *agents)
       # @param [Array<Concurrent::Agent>] agents the Agents on which to wait
       # @return [Boolean] true if all actions complete before timeout
       #
-      # @raise [Concurrent::TimeoutError] when timout is reached
+      # @raise [Concurrent::TimeoutError] when timeout is reached
       # @!macro agent_await_warning
       def await_for!(timeout, *agents)
         raise Concurrent::TimeoutError unless await_for(timeout, *agents)

diff --git a/...4/lib/concurrent-ruby/concurrent/array.rb → ...5/lib/concurrent-ruby/concurrent/array.rb b/...4/lib/concurrent-ruby/concurrent/array.rb → ...5/lib/concurrent-ruby/concurrent/array.rb
diff --git a/...4/lib/concurrent-ruby/concurrent/async.rb → ...5/lib/concurrent-ruby/concurrent/async.rb b/...4/lib/concurrent-ruby/concurrent/async.rb → ...5/lib/concurrent-ruby/concurrent/async.rb
@@ -218,7 +218,7 @@ module Async
 
     # @!method self.new(*args, &block)
     #
-    #   Instanciate a new object and ensure proper initialization of the
+    #   Instantiate a new object and ensure proper initialization of the
     #   synchronization mechanisms.
     #
     #   @param [Array<Object>] args Zero or more arguments to be passed to the

diff --git a/....4/lib/concurrent-ruby/concurrent/atom.rb → ....5/lib/concurrent-ruby/concurrent/atom.rb b/....4/lib/concurrent-ruby/concurrent/atom.rb → ....5/lib/concurrent-ruby/concurrent/atom.rb
@@ -113,7 +113,7 @@ class Atom < Synchronization::Object
     # @option opts [Proc] :validator (nil) Optional proc used to validate new
     #   values. It must accept one and only one argument which will be the
     #   intended new value. The validator will return true if the new value
-    #   is acceptable else return false (preferrably) or raise an exception.
+    #   is acceptable else return false (preferably) or raise an exception.
     #
     # @!macro deref_options
     #

diff --git a/...-ruby/concurrent/atomic/atomic_boolean.rb → ...-ruby/concurrent/atomic/atomic_boolean.rb b/...-ruby/concurrent/atomic/atomic_boolean.rb → ...-ruby/concurrent/atomic/atomic_boolean.rb
diff --git a/...t-ruby/concurrent/atomic/atomic_fixnum.rb → ...t-ruby/concurrent/atomic/atomic_fixnum.rb b/...t-ruby/concurrent/atomic/atomic_fixnum.rb → ...t-ruby/concurrent/atomic/atomic_fixnum.rb
diff --git a/...rrent/atomic/atomic_markable_reference.rb → ...rrent/atomic/atomic_markable_reference.rb b/...rrent/atomic/atomic_markable_reference.rb → ...rrent/atomic/atomic_markable_reference.rb
diff --git a/...uby/concurrent/atomic/atomic_reference.rb → ...uby/concurrent/atomic/atomic_reference.rb b/...uby/concurrent/atomic/atomic_reference.rb → ...uby/concurrent/atomic/atomic_reference.rb
diff --git a/...uby/concurrent/atomic/count_down_latch.rb → ...uby/concurrent/atomic/count_down_latch.rb b/...uby/concurrent/atomic/count_down_latch.rb → ...uby/concurrent/atomic/count_down_latch.rb
diff --git a/...-ruby/concurrent/atomic/cyclic_barrier.rb → ...-ruby/concurrent/atomic/cyclic_barrier.rb b/...-ruby/concurrent/atomic/cyclic_barrier.rb → ...-ruby/concurrent/atomic/cyclic_barrier.rb
diff --git a/...oncurrent-ruby/concurrent/atomic/event.rb → ...oncurrent-ruby/concurrent/atomic/event.rb b/...oncurrent-ruby/concurrent/atomic/event.rb → ...oncurrent-ruby/concurrent/atomic/event.rb
diff --git a/...ruby/concurrent/atomic/fiber_local_var.rb → ...ruby/concurrent/atomic/fiber_local_var.rb b/...ruby/concurrent/atomic/fiber_local_var.rb → ...ruby/concurrent/atomic/fiber_local_var.rb
diff --git a/...oncurrent/atomic/java_count_down_latch.rb → ...oncurrent/atomic/java_count_down_latch.rb b/...oncurrent/atomic/java_count_down_latch.rb → ...oncurrent/atomic/java_count_down_latch.rb
diff --git a/...ncurrent-ruby/concurrent/atomic/locals.rb → ...ncurrent-ruby/concurrent/atomic/locals.rb b/...ncurrent-ruby/concurrent/atomic/locals.rb → ...ncurrent-ruby/concurrent/atomic/locals.rb
diff --git a/...-ruby/concurrent/atomic/lock_local_var.rb → ...-ruby/concurrent/atomic/lock_local_var.rb b/...-ruby/concurrent/atomic/lock_local_var.rb → ...-ruby/concurrent/atomic/lock_local_var.rb
diff --git a/...concurrent/atomic/mutex_atomic_boolean.rb → ...concurrent/atomic/mutex_atomic_boolean.rb b/...concurrent/atomic/mutex_atomic_boolean.rb → ...concurrent/atomic/mutex_atomic_boolean.rb
diff --git a/.../concurrent/atomic/mutex_atomic_fixnum.rb → .../concurrent/atomic/mutex_atomic_fixnum.rb b/.../concurrent/atomic/mutex_atomic_fixnum.rb → .../concurrent/atomic/mutex_atomic_fixnum.rb
diff --git a/...ncurrent/atomic/mutex_count_down_latch.rb → ...ncurrent/atomic/mutex_count_down_latch.rb b/...ncurrent/atomic/mutex_count_down_latch.rb → ...ncurrent/atomic/mutex_count_down_latch.rb
diff --git a/...ruby/concurrent/atomic/mutex_semaphore.rb → ...ruby/concurrent/atomic/mutex_semaphore.rb b/...ruby/concurrent/atomic/mutex_semaphore.rb → ...ruby/concurrent/atomic/mutex_semaphore.rb
diff --git a/...ruby/concurrent/atomic/read_write_lock.rb → ...ruby/concurrent/atomic/read_write_lock.rb b/...ruby/concurrent/atomic/read_write_lock.rb → ...ruby/concurrent/atomic/read_write_lock.rb
diff --git a/...rrent/atomic/reentrant_read_write_lock.rb → ...rrent/atomic/reentrant_read_write_lock.rb b/...rrent/atomic/reentrant_read_write_lock.rb → ...rrent/atomic/reentrant_read_write_lock.rb
diff --git a/...rrent-ruby/concurrent/atomic/semaphore.rb → ...rrent-ruby/concurrent/atomic/semaphore.rb b/...rrent-ruby/concurrent/atomic/semaphore.rb → ...rrent-ruby/concurrent/atomic/semaphore.rb
diff --git a/...uby/concurrent/atomic/thread_local_var.rb → ...uby/concurrent/atomic/thread_local_var.rb b/...uby/concurrent/atomic/thread_local_var.rb → ...uby/concurrent/atomic/thread_local_var.rb
diff --git a/.../atomic_reference/atomic_direct_update.rb → .../atomic_reference/atomic_direct_update.rb b/.../atomic_reference/atomic_direct_update.rb → .../atomic_reference/atomic_direct_update.rb
diff --git a/...ncurrent/atomic_reference/mutex_atomic.rb → ...ncurrent/atomic_reference/mutex_atomic.rb b/...ncurrent/atomic_reference/mutex_atomic.rb → ...ncurrent/atomic_reference/mutex_atomic.rb
diff --git a/...t/atomic_reference/numeric_cas_wrapper.rb → ...t/atomic_reference/numeric_cas_wrapper.rb b/...t/atomic_reference/numeric_cas_wrapper.rb → ...t/atomic_reference/numeric_cas_wrapper.rb
diff --git a/...lib/concurrent-ruby/concurrent/atomics.rb → ...lib/concurrent-ruby/concurrent/atomics.rb b/...lib/concurrent-ruby/concurrent/atomics.rb → ...lib/concurrent-ruby/concurrent/atomics.rb
diff --git a/...collection/copy_on_notify_observer_set.rb → ...collection/copy_on_notify_observer_set.rb b/...collection/copy_on_notify_observer_set.rb → ...collection/copy_on_notify_observer_set.rb
diff --git a/.../collection/copy_on_write_observer_set.rb → .../collection/copy_on_write_observer_set.rb b/.../collection/copy_on_write_observer_set.rb → .../collection/copy_on_write_observer_set.rb
diff --git a/...ion/java_non_concurrent_priority_queue.rb → ...ion/java_non_concurrent_priority_queue.rb b/...ion/java_non_concurrent_priority_queue.rb → ...ion/java_non_concurrent_priority_queue.rb
diff --git a/.../concurrent/collection/lock_free_stack.rb → .../concurrent/collection/lock_free_stack.rb b/.../concurrent/collection/lock_free_stack.rb → .../concurrent/collection/lock_free_stack.rb
diff --git a/...current/collection/map/mri_map_backend.rb → ...current/collection/map/mri_map_backend.rb b/...current/collection/map/mri_map_backend.rb → ...current/collection/map/mri_map_backend.rb
diff --git a/...lection/map/non_concurrent_map_backend.rb → ...lection/map/non_concurrent_map_backend.rb b/...lection/map/non_concurrent_map_backend.rb → ...lection/map/non_concurrent_map_backend.rb
diff --git a/...ollection/map/synchronized_map_backend.rb → ...ollection/map/synchronized_map_backend.rb b/...ollection/map/synchronized_map_backend.rb → ...ollection/map/synchronized_map_backend.rb
diff --git a/...collection/map/truffleruby_map_backend.rb → ...collection/map/truffleruby_map_backend.rb b/...collection/map/truffleruby_map_backend.rb → ...collection/map/truffleruby_map_backend.rb
diff --git a/...llection/non_concurrent_priority_queue.rb → ...llection/non_concurrent_priority_queue.rb b/...llection/non_concurrent_priority_queue.rb → ...llection/non_concurrent_priority_queue.rb
diff --git a/...ion/ruby_non_concurrent_priority_queue.rb → ...ion/ruby_non_concurrent_priority_queue.rb b/...ion/ruby_non_concurrent_priority_queue.rb → ...ion/ruby_non_concurrent_priority_queue.rb
diff --git a/...nt-ruby/concurrent/concern/deprecation.rb → ...nt-ruby/concurrent/concern/deprecation.rb b/...nt-ruby/concurrent/concern/deprecation.rb → ...nt-ruby/concurrent/concern/deprecation.rb
diff --git a/...uby/concurrent/concern/dereferenceable.rb → ...uby/concurrent/concern/dereferenceable.rb b/...uby/concurrent/concern/dereferenceable.rb → ...uby/concurrent/concern/dereferenceable.rb
diff --git a/...urrent-ruby/concurrent/concern/logging.rb → ...urrent-ruby/concurrent/concern/logging.rb b/...urrent-ruby/concurrent/concern/logging.rb → ...urrent-ruby/concurrent/concern/logging.rb
@@ -1,4 +1,3 @@
-require 'logger'
 require 'concurrent/atomic/atomic_reference'
 
 module Concurrent
@@ -8,10 +7,12 @@ module Concern
     #
     # @!visibility private
     module Logging
-      include Logger::Severity
+      # The same as Logger::Severity but we copy it here to avoid a dependency on the logger gem just for these 7 constants
+      DEBUG, INFO, WARN, ERROR, FATAL, UNKNOWN = 0, 1, 2, 3, 4, 5
+      SEV_LABEL = %w[DEBUG INFO WARN ERROR FATAL ANY].freeze
 
       # Logs through {Concurrent.global_logger}, it can be overridden by setting @logger
-      # @param [Integer] level one of Logger::Severity constants
+      # @param [Integer] level one of Concurrent::Concern::Logging constants
       # @param [String] progname e.g. a path of an Actor
       # @param [String, nil] message when nil block is used to generate the message
       # @yieldreturn [String] a message
@@ -23,7 +24,7 @@ def log(level, progname, message = nil, &block)
                  end
         logger.call level, progname, message, &block
       rescue => error
-        $stderr.puts "`Concurrent.configuration.logger` failed to log #{[level, progname, message, block]}\n" +
+        $stderr.puts "`Concurrent.global_logger` failed to log #{[level, progname, message, block]}\n" +
           "#{error.message} (#{error.class})\n#{error.backtrace.join "\n"}"
       end
     end
@@ -33,8 +34,10 @@ def log(level, progname, message = nil, &block)
 module Concurrent
   extend Concern::Logging
 
-  # @return [Logger] Logger with provided level and output.
-  def self.create_simple_logger(level = Logger::FATAL, output = $stderr)
+  # Create a simple logger with provided level and output.
+  def self.create_simple_logger(level = :FATAL, output = $stderr)
+    level = Concern::Logging.const_get(level) unless level.is_a?(Integer)
+
     # TODO (pitr-ch 24-Dec-2016): figure out why it had to be replaced, stdlogger was deadlocking
     lambda do |severity, progname, message = nil, &block|
       return false if severity < level
@@ -52,21 +55,23 @@ def self.create_simple_logger(level = Logger::FATAL, output = $stderr)
 
       output.print format "[%s] %5s -- %s: %s\n",
                           Time.now.strftime('%Y-%m-%d %H:%M:%S.%L'),
-                          Logger::SEV_LABEL[severity],
+                          Concern::Logging::SEV_LABEL[severity],
                           progname,
                           formatted_message
       true
     end
   end
 
   # Use logger created by #create_simple_logger to log concurrent-ruby messages.
-  def self.use_simple_logger(level = Logger::FATAL, output = $stderr)
+  def self.use_simple_logger(level = :FATAL, output = $stderr)
     Concurrent.global_logger = create_simple_logger level, output
   end
 
-  # @return [Logger] Logger with provided level and output.
+  # Create a stdlib logger with provided level and output.
+  # If you use this deprecated method you might need to add logger to your Gemfile to avoid warnings from Ruby 3.3.5+.
   # @deprecated
-  def self.create_stdlib_logger(level = Logger::FATAL, output = $stderr)
+  def self.create_stdlib_logger(level = :FATAL, output = $stderr)
+    require 'logger'
     logger           = Logger.new(output)
     logger.level     = level
     logger.formatter = lambda do |severity, datetime, progname, msg|
@@ -93,7 +98,7 @@ def self.create_stdlib_logger(level = Logger::FATAL, output = $stderr)
 
   # Use logger created by #create_stdlib_logger to log concurrent-ruby messages.
   # @deprecated
-  def self.use_stdlib_logger(level = Logger::FATAL, output = $stderr)
+  def self.use_stdlib_logger(level = :FATAL, output = $stderr)
     Concurrent.global_logger = create_stdlib_logger level, output
   end
 
@@ -103,7 +108,7 @@ def self.use_stdlib_logger(level = Logger::FATAL, output = $stderr)
   NULL_LOGGER   = lambda { |level, progname, message = nil, &block| }
 
   # @!visibility private
-  GLOBAL_LOGGER = AtomicReference.new(create_simple_logger(Logger::WARN))
+  GLOBAL_LOGGER = AtomicReference.new(create_simple_logger(:WARN))
   private_constant :GLOBAL_LOGGER
 
   def self.global_logger

diff --git a/...ent-ruby/concurrent/concern/obligation.rb → ...ent-ruby/concurrent/concern/obligation.rb b/...ent-ruby/concurrent/concern/obligation.rb → ...ent-ruby/concurrent/concern/obligation.rb
diff --git a/...ent-ruby/concurrent/concern/observable.rb → ...ent-ruby/concurrent/concern/observable.rb b/...ent-ruby/concurrent/concern/observable.rb → ...ent-ruby/concurrent/concern/observable.rb
diff --git a/.../ruby/3.3.0/gems/concurrent-ruby-1.3.5/lib/concurrent-ruby/concurrent/concurrent_ruby.jar b/.../ruby/3.3.0/gems/concurrent-ruby-1.3.5/lib/concurrent-ruby/concurrent/concurrent_ruby.jar
diff --git a/...ncurrent-ruby/concurrent/configuration.rb → ...ncurrent-ruby/concurrent/configuration.rb b/...ncurrent-ruby/concurrent/configuration.rb → ...ncurrent-ruby/concurrent/configuration.rb
diff --git a/...b/concurrent-ruby/concurrent/constants.rb → ...b/concurrent-ruby/concurrent/constants.rb b/...b/concurrent-ruby/concurrent/constants.rb → ...b/concurrent-ruby/concurrent/constants.rb
diff --git a/...ib/concurrent-ruby/concurrent/dataflow.rb → ...ib/concurrent-ruby/concurrent/dataflow.rb b/...ib/concurrent-ruby/concurrent/dataflow.rb → ...ib/concurrent-ruby/concurrent/dataflow.rb