Merge pull request #317 from ruby-concurrency/internal-reorg-struct

Structs are now at the top-level Concurrent namespace.

Author: jdantonio

lib/concurrent.rb

@@ -9,19 +9,21 @@
 require 'concurrent/errors'
 require 'concurrent/executors'
 require 'concurrent/utilities'
-require 'concurrent/struct'
 
 require 'concurrent/atomic/atomic_reference'
 require 'concurrent/atom'
 require 'concurrent/async'
 require 'concurrent/dataflow'
 require 'concurrent/delay'
 require 'concurrent/future'
+require 'concurrent/immutable_struct'
 require 'concurrent/ivar'
 require 'concurrent/maybe'
+require 'concurrent/mutable_struct'
 require 'concurrent/mvar'
 require 'concurrent/promise'
 require 'concurrent/scheduled_task'
+require 'concurrent/settable_struct'
 require 'concurrent/timer_task'
 require 'concurrent/tvar'
 

lib/concurrent/struct/immutable_struct.rb lib/concurrent/immutable_struct.rblib/concurrent/struct/immutable_struct.rb renamed to lib/concurrent/immutable_struct.rb

@@ -1,4 +1,4 @@
-require 'concurrent/struct/abstract_struct'
+require 'concurrent/synchronization/abstract_struct'
 require 'concurrent/synchronization'
 
 module Concurrent
@@ -7,7 +7,7 @@ module Concurrent
   #
   # @see http://ruby-doc.org/core-2.2.0/Struct.html Ruby standard library `Struct`
   module ImmutableStruct
-    include AbstractStruct
+    include Synchronization::AbstractStruct
 
     # @!macro struct_values
     def values
@@ -80,7 +80,7 @@ def self.new(*args, &block)
     FACTORY = Class.new(Synchronization::Object) do
       def define_struct(name, members, &block)
         synchronize do
-          AbstractStruct.define_struct_class(ImmutableStruct, Synchronization::Object, name, members, &block)
+          Synchronization::AbstractStruct.define_struct_class(ImmutableStruct, Synchronization::Object, name, members, &block)
         end
       end
     end.new

lib/concurrent/struct/mutable_struct.rb lib/concurrent/mutable_struct.rblib/concurrent/struct/mutable_struct.rb renamed to lib/concurrent/mutable_struct.rb

@@ -1,4 +1,4 @@
-require 'concurrent/struct/abstract_struct'
+require 'concurrent/synchronization/abstract_struct'
 require 'concurrent/synchronization'
 
 module Concurrent
@@ -8,7 +8,7 @@ module Concurrent
   #
   # @see http://ruby-doc.org/core-2.2.0/Struct.html Ruby standard library `Struct`
   module MutableStruct
-    include AbstractStruct
+    include Synchronization::AbstractStruct
 
     # @!macro [new] struct_new
     #
@@ -88,7 +88,7 @@ def inspect
     #   @yieldparam [Object] selfvalue the value of the member in `self`
     #   @yieldparam [Object] othervalue the value of the member in `other`
     #
-    #   @return [AbstractStruct] a new struct with the new values
+    #   @return [Synchronization::AbstractStruct] a new struct with the new values
     #
     #   @raise [ArgumentError] of given a member that is not defined in the struct
     def merge(other, &block)
@@ -209,7 +209,7 @@ def self.new(*args, &block)
     FACTORY = Class.new(Synchronization::Object) do
       def define_struct(name, members, &block)
         synchronize do
-          clazz = AbstractStruct.define_struct_class(MutableStruct, Synchronization::Object, name, members, &block)
+          clazz = Synchronization::AbstractStruct.define_struct_class(MutableStruct, Synchronization::Object, name, members, &block)
           members.each_with_index do |member, index|
             clazz.send(:define_method, member) do
               synchronize { @values[index] }

lib/concurrent/struct/settable_struct.rb lib/concurrent/settable_struct.rblib/concurrent/struct/settable_struct.rb renamed to lib/concurrent/settable_struct.rb

@@ -1,4 +1,4 @@
-require 'concurrent/struct/abstract_struct'
+require 'concurrent/synchronization/abstract_struct'
 require 'concurrent/errors'
 require 'concurrent/synchronization'
 
@@ -12,7 +12,7 @@ module Concurrent
   # @see http://ruby-doc.org/core-2.2.0/Struct.html Ruby standard library `Struct`
   # @see http://en.wikipedia.org/wiki/Final_(Java) Java `final` keyword
   module SettableStruct
-    include AbstractStruct
+    include Synchronization::AbstractStruct
 
     # @!macro struct_values
     def values
@@ -104,7 +104,7 @@ def self.new(*args, &block)
     FACTORY = Class.new(Synchronization::Object) do
       def define_struct(name, members, &block)
         synchronize do
-          clazz = AbstractStruct.define_struct_class(SettableStruct, Synchronization::Object, name, members, &block)
+          clazz = Synchronization::AbstractStruct.define_struct_class(SettableStruct, Synchronization::Object, name, members, &block)
           members.each_with_index do |member, index|
             clazz.send(:define_method, member) do
               synchronize { @values[index] }