Skip to content

Commit a3ce6ca

Browse files
committed
Remove deprecated ActiveSupport::Cache::Store.instrument
1 parent c7a1fa3 commit a3ce6ca

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

activesupport/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
* Remove deprecated methods `ActiveSupport::Cache::Store.instrument` and
2+
`ActiveSupport::Cache::Store.instrument=`.
3+
4+
*Rafael Mendonça França*
5+
16
* Change the way in which callback chains can be halted.
27

38
The preferred method to halt a callback chain from now on is to explicitly
@@ -8,7 +13,6 @@
813
`Callbacks::CallbackChain.halt_and_display_warning_on_return_false`, will
914
either not work at all or display a deprecation warning.
1015

11-
1216
* Add Callbacks::CallbackChain.halt_and_display_warning_on_return_false
1317

1418
Setting `Callbacks::CallbackChain.halt_and_display_warning_on_return_false`

activesupport/lib/active_support/cache.rb

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
require 'active_support/core_ext/numeric/time'
99
require 'active_support/core_ext/object/to_param'
1010
require 'active_support/core_ext/string/inflections'
11-
require 'active_support/deprecation'
1211

1312
module ActiveSupport
1413
# See ActiveSupport::Cache::Store for documentation.
@@ -179,18 +178,6 @@ def mute
179178
@silence = previous_silence
180179
end
181180

182-
# :deprecated:
183-
def self.instrument=(boolean)
184-
ActiveSupport::Deprecation.warn "ActiveSupport::Cache.instrument= is deprecated and will be removed in Rails 5. Instrumentation is now always on so you can safely stop using it."
185-
true
186-
end
187-
188-
# :deprecated:
189-
def self.instrument
190-
ActiveSupport::Deprecation.warn "ActiveSupport::Cache.instrument is deprecated and will be removed in Rails 5. Instrumentation is now always on so you can safely stop using it."
191-
true
192-
end
193-
194181
# Fetches data from the cache, using the given key. If there is data in
195182
# the cache with the given key, then that data is returned.
196183
#

0 commit comments

Comments
 (0)