diff options
| author | Jerry D'Antonio <stumpjumper@gmail.com> | 2015-09-19 09:56:26 -0400 |
|---|---|---|
| committer | Jerry D'Antonio <stumpjumper@gmail.com> | 2015-09-19 09:56:26 -0400 |
| commit | 56ac6e4768adb1f7055474d40a9e921380559c43 (patch) | |
| tree | 01e085d38060f8739944177d6001c6996b6fc779 /activesupport/lib/active_support/values | |
| parent | 0c39a022b0b432afff240c5624dadee00da8d175 (diff) | |
| download | rails-56ac6e4768adb1f7055474d40a9e921380559c43.tar.gz rails-56ac6e4768adb1f7055474d40a9e921380559c43.tar.bz2 rails-56ac6e4768adb1f7055474d40a9e921380559c43.zip | |
Replaced `ThreadSafe::Map` with successor `Concurrent::Map`.
The thread_safe gem is being deprecated and all its code has been merged
into the concurrent-ruby gem. The new class, Concurrent::Map, is exactly
the same as its predecessor except for fixes to two bugs discovered
during the merge.
Diffstat (limited to 'activesupport/lib/active_support/values')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index c8dbe92171..4502e01b12 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 'thread_safe' +require 'concurrent' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/object/try' @@ -189,7 +189,7 @@ module ActiveSupport UTC_OFFSET_WITH_COLON = '%s%02d:%02d' UTC_OFFSET_WITHOUT_COLON = UTC_OFFSET_WITH_COLON.tr(':', '') - @lazy_zones_map = ThreadSafe::Cache.new + @lazy_zones_map = Concurrent::Map.new class << self # Assumes self represents an offset from UTC in seconds (as returned from |