From 9cafc28874a681082f9f7e1e445db91f195a25ae Mon Sep 17 00:00:00 2001 From: Josh Kalderimis Date: Wed, 25 May 2011 23:34:53 +0200 Subject: Removed deprecated methods and related tests from ActiveSupport --- activesupport/lib/active_support/benchmarkable.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'activesupport/lib/active_support/benchmarkable.rb') diff --git a/activesupport/lib/active_support/benchmarkable.rb b/activesupport/lib/active_support/benchmarkable.rb index 21c0296269..e303eaa5ce 100644 --- a/activesupport/lib/active_support/benchmarkable.rb +++ b/activesupport/lib/active_support/benchmarkable.rb @@ -31,13 +31,8 @@ module ActiveSupport # <% end %> def benchmark(message = "Benchmarking", options = {}) if logger - if options.is_a?(Symbol) - ActiveSupport::Deprecation.warn("use benchmark('#{message}', :level => :#{options}) instead", caller) - options = { :level => options, :silence => false } - else - options.assert_valid_keys(:level, :silence) - options[:level] ||= :info - end + options.assert_valid_keys(:level, :silence) + options[:level] ||= :info result = nil ms = Benchmark.ms { result = options[:silence] ? logger.silence { yield } : yield } -- cgit v1.2.3