aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-05-20 17:37:16 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2016-05-20 17:37:16 -0700
commit5929853524d350a846111666303cb2f8a8507024 (patch)
tree0c49f857dffae12e5c7468d13fc12695925f9d5f
parent350a6532fc9af31c7ca6c404f03c062310e2a373 (diff)
parent7aedae6de58195efb1e2d79af212d1c7290f2f73 (diff)
downloadrails-5929853524d350a846111666303cb2f8a8507024.tar.gz
rails-5929853524d350a846111666303cb2f8a8507024.tar.bz2
rails-5929853524d350a846111666303cb2f8a8507024.zip
Merge pull request #25041 from maclover7/jm-actionview
[Action View] Don't create middleman `DetailsKey` instance
-rw-r--r--actionview/lib/action_view/lookup_context.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/actionview/lib/action_view/lookup_context.rb b/actionview/lib/action_view/lookup_context.rb
index 626c4b8f5e..9db1460ee7 100644
--- a/actionview/lib/action_view/lookup_context.rb
+++ b/actionview/lib/action_view/lookup_context.rb
@@ -63,7 +63,7 @@ module ActionView
details = details.dup
details[:formats] &= Template::Types.symbols
end
- @details_keys[details] ||= new
+ @details_keys[details] ||= Concurrent::Map.new
end
def self.clear
@@ -71,13 +71,7 @@ module ActionView
end
def self.digest_caches
- @details_keys.values.map(&:digest_cache)
- end
-
- attr_reader :digest_cache
-
- def initialize
- @digest_cache = Concurrent::Map.new
+ @details_keys.values
end
end
@@ -236,7 +230,7 @@ module ActionView
end
def digest_cache
- details_key.digest_cache
+ details_key
end
def initialize_details(target, details)