From 23b6f65fd130c29e5f6ea69e09f6381cf7e34e27 Mon Sep 17 00:00:00 2001
From: Jerry D'Antonio <stumpjumper@gmail.com>
Date: Mon, 2 Nov 2015 21:30:50 -0500
Subject: Require only necessary concurrent-ruby classes.

---
 activesupport/activesupport.gemspec                       | 2 +-
 activesupport/lib/active_support/concurrency/latch.rb     | 4 ++--
 activesupport/lib/active_support/dependencies.rb          | 2 +-
 activesupport/lib/active_support/inflector/inflections.rb | 2 +-
 activesupport/lib/active_support/key_generator.rb         | 2 +-
 activesupport/lib/active_support/notifications/fanout.rb  | 2 +-
 activesupport/lib/active_support/values/time_zone.rb      | 2 +-
 activesupport/test/share_lock_test.rb                     | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'activesupport')

diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 93878518d7..404c16b29f 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'json',       '~> 1.7', '>= 1.7.7'
   s.add_dependency 'tzinfo',     '~> 1.1'
   s.add_dependency 'minitest',   '~> 5.1'
-  s.add_dependency 'concurrent-ruby', '~> 1.0.0.pre3', '< 2.0.0'
+  s.add_dependency 'concurrent-ruby', '~> 1.0.0.pre5', '< 2.0.0'
   s.add_dependency 'method_source'
 end
diff --git a/activesupport/lib/active_support/concurrency/latch.rb b/activesupport/lib/active_support/concurrency/latch.rb
index 7b8df0df04..4abe5ece6f 100644
--- a/activesupport/lib/active_support/concurrency/latch.rb
+++ b/activesupport/lib/active_support/concurrency/latch.rb
@@ -1,4 +1,4 @@
-require 'concurrent/atomics'
+require 'concurrent/atomic/count_down_latch'
 
 module ActiveSupport
   module Concurrency
@@ -8,7 +8,7 @@ module ActiveSupport
         ActiveSupport::Deprecation.warn("ActiveSupport::Concurrency::Latch is deprecated. Please use Concurrent::CountDownLatch instead.")
         super(count)
       end
-      
+
       alias_method :release, :count_down
 
       def await
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb
index dc9f97168a..af18ff746f 100644
--- a/activesupport/lib/active_support/dependencies.rb
+++ b/activesupport/lib/active_support/dependencies.rb
@@ -1,6 +1,6 @@
 require 'set'
 require 'thread'
-require 'concurrent'
+require 'concurrent/map'
 require 'pathname'
 require 'active_support/core_ext/module/aliasing'
 require 'active_support/core_ext/module/attribute_accessors'
diff --git a/activesupport/lib/active_support/inflector/inflections.rb b/activesupport/lib/active_support/inflector/inflections.rb
index c3907e9c22..f3e52b48ac 100644
--- a/activesupport/lib/active_support/inflector/inflections.rb
+++ b/activesupport/lib/active_support/inflector/inflections.rb
@@ -1,4 +1,4 @@
-require 'concurrent'
+require 'concurrent/map'
 require 'active_support/core_ext/array/prepend_and_append'
 require 'active_support/i18n'
 
diff --git a/activesupport/lib/active_support/key_generator.rb b/activesupport/lib/active_support/key_generator.rb
index e88b04da3e..7f73f9ddfc 100644
--- a/activesupport/lib/active_support/key_generator.rb
+++ b/activesupport/lib/active_support/key_generator.rb
@@ -1,4 +1,4 @@
-require 'concurrent'
+require 'concurrent/map'
 require 'openssl'
 
 module ActiveSupport
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb
index 71354dd15f..7798c7ec60 100644
--- a/activesupport/lib/active_support/notifications/fanout.rb
+++ b/activesupport/lib/active_support/notifications/fanout.rb
@@ -1,5 +1,5 @@
 require 'mutex_m'
-require 'concurrent'
+require 'concurrent/map'
 
 module ActiveSupport
   module Notifications
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 9f4bb6762d..6404f65612 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -1,5 +1,5 @@
 require 'tzinfo'
-require 'concurrent'
+require 'concurrent/map'
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/object/try'
 
diff --git a/activesupport/test/share_lock_test.rb b/activesupport/test/share_lock_test.rb
index ad41db608b..465a657308 100644
--- a/activesupport/test/share_lock_test.rb
+++ b/activesupport/test/share_lock_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'concurrent/atomics'
+require 'concurrent/atomic/count_down_latch'
 require 'active_support/concurrency/share_lock'
 
 class ShareLockTest < ActiveSupport::TestCase
-- 
cgit v1.2.3