Move array, hash, and map to main space; suerseed NO_VALUE with NULL

Author: pitr-ch

lib/concurrent.rb

@@ -10,10 +10,10 @@
 
 require 'concurrent/atomic/atomic_reference'
 require 'concurrent/atom'
-require 'concurrent/collection/array'
-require 'concurrent/collection/hash'
-require 'concurrent/collection/map'
-require 'concurrent/collection/tuple'
+require 'concurrent/array'
+require 'concurrent/hash'
+require 'concurrent/map'
+require 'concurrent/tuple'
 require 'concurrent/async'
 require 'concurrent/dataflow'
 require 'concurrent/delay'

lib/concurrent/collection/array.rb renamed to lib/concurrent/array.rb

@@ -27,7 +27,7 @@ class Future < IVar
     # @raise [ArgumentError] if no block is given
     def initialize(opts = {}, &block)
       raise ArgumentError.new('no block given') unless block_given?
-      super(IVar::NO_VALUE, opts.merge(__task_from_block__: block), &nil)
+      super(NULL, opts.merge(__task_from_block__: block), &nil)
     end
 
     # Execute an `:unscheduled` `Future`. Immediately sets the state to `:pending` and
@@ -74,7 +74,7 @@ def self.execute(opts = {}, &block)
     end
 
     # @!macro ivar_set_method
-    def set(value = IVar::NO_VALUE, &block)
+    def set(value = NULL, &block)
       check_for_block_or_value!(block_given?, value)
       synchronize do
         if @state != :unscheduled

lib/concurrent/future.rb

@@ -47,9 +47,6 @@ class IVar < Synchronization::Object
     include Concern::Obligation
     include Concern::Observable
 
-    # @!visibility private
-    NO_VALUE = Object.new # :nodoc:
-
     # Create a new `IVar` in the `:pending` state with the (optional) initial value.
     #
     # @param [Object] value the initial value
@@ -60,8 +57,8 @@ class IVar < Synchronization::Object
     #   returning the data
     # @option opts [String] :copy_on_deref (nil) call the given `Proc` passing
     #   the internal value and returning the value returned from the proc
-    def initialize(value = NO_VALUE, opts = {}, &block)
-      if value != NO_VALUE && block_given?
+    def initialize(value = NULL, opts = {}, &block)
+      if value != NULL && block_given?
         raise ArgumentError.new('provide only a value or a block')
       end
       super(&nil)
@@ -102,16 +99,16 @@ def add_observer(observer = nil, func = :update, &block)
 
     # @!macro [attach] ivar_set_method
     #   Set the `IVar` to a value and wake or notify all threads waiting on it.
-    #  
+    #
     #   @!macro [attach] ivar_set_parameters_and_exceptions
     #     @param [Object] value the value to store in the `IVar`
     #     @yield A block operation to use for setting the value
     #     @raise [ArgumentError] if both a value and a block are given
     #     @raise [Concurrent::MultipleAssignmentError] if the `IVar` has already
     #       been set or otherwise completed
-    #  
+    #
     #   @return [IVar] self
-    def set(value = NO_VALUE)
+    def set(value = NULL)
       check_for_block_or_value!(block_given?, value)
       raise MultipleAssignmentError unless compare_and_set_state(:processing, :pending)
 
@@ -128,7 +125,7 @@ def set(value = NO_VALUE)
 
     # @!macro [attach] ivar_fail_method
     #   Set the `IVar` to failed due to some error and wake or notify all threads waiting on it.
-    #  
+    #
     #   @param [Object] reason for the failure
     #   @raise [Concurrent::MultipleAssignmentError] if the `IVar` has already
     #     been set or otherwise completed
@@ -143,7 +140,7 @@ def fail(reason = StandardError.new)
     # @!macro ivar_set_parameters_and_exceptions
     #
     # @return [Boolean] true if the value was set else false
-    def try_set(value = NO_VALUE, &block)
+    def try_set(value = NULL, &block)
       set(value, &block)
       true
     rescue MultipleAssignmentError
@@ -159,7 +156,7 @@ def ns_initialize(value, opts)
       self.observers = Collection::CopyOnWriteObserverSet.new
       set_deref_options(opts)
 
-      if value == NO_VALUE
+      if value == NULL
         @state = :pending
       else
         ns_complete_without_notification(true, value, nil)
@@ -202,7 +199,7 @@ def ns_complete_without_notification(success, value, reason)
 
     # @!visibility private
     def check_for_block_or_value!(block_given, value) # :nodoc:
-      if (block_given && value != NO_VALUE) || (! block_given && value == NO_VALUE)
+      if (block_given && value != NULL) || (! block_given && value == NULL)
         raise ArgumentError.new('must set with either a value or a block')
       end
     end

lib/concurrent/collection/hash.rb renamed to lib/concurrent/hash.rb

@@ -205,7 +205,7 @@ class Promise < IVar
     # @see http://promises-aplus.github.io/promises-spec/
     def initialize(opts = {}, &block)
       opts.delete_if { |k, v| v.nil? }
-      super(IVar::NO_VALUE, opts.merge(__promise_body_from_block__: block), &nil)
+      super(NULL, opts.merge(__promise_body_from_block__: block), &nil)
     end
 
     # Create a new `Promise` and fulfill it immediately.
@@ -254,7 +254,7 @@ def execute
     # @!macro ivar_set_method
     #
     # @raise [Concurrent::PromiseExecutionError] if not the root promise
-    def set(value = IVar::NO_VALUE, &block)
+    def set(value = NULL, &block)
       raise PromiseExecutionError.new('supported only on root promise') unless root?
       check_for_block_or_value!(block_given?, value)
       synchronize do

lib/concurrent/ivar.rb

@@ -163,7 +163,7 @@ def initialize(delay, opts = {}, &task)
       raise ArgumentError.new('no block given') unless block_given?
       raise ArgumentError.new('seconds must be greater than zero') if delay.to_f < 0.0
 
-      super(IVar::NO_VALUE, opts, &nil)
+      super(NULL, opts, &nil)
 
       synchronize do
         ns_set_state(:unscheduled)

lib/concurrent/collection/map.rb renamed to lib/concurrent/map.rb

@@ -13,7 +13,7 @@ module Util
   end
 end
 
-require 'concurrent/collection/tuple'
+require 'concurrent/tuple'
 require 'concurrent/thread_safe/util/xor_shift_random'
 require 'concurrent/thread_safe/util/volatile'
 require 'concurrent/thread_safe/util/striped64'

lib/concurrent/promise.rb

@@ -1,4 +1,4 @@
-require 'concurrent/collection/tuple'
+require 'concurrent/tuple'
 
 module Concurrent