From 434c691df6d101c840f6be3b44388c208c8f69bf Mon Sep 17 00:00:00 2001 From: Vasiliy Ermolovich Date: Sun, 25 Dec 2011 18:22:54 +0300 Subject: [PATCH] remove useless 1.8 ruby code from Range#step, because Range#step without block always returns enumerator --- .../core_ext/range/blockless_step.rb | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/activesupport/lib/active_support/core_ext/range/blockless_step.rb b/activesupport/lib/active_support/core_ext/range/blockless_step.rb index db42ef5c473ea..f687287f0d145 100644 --- a/activesupport/lib/active_support/core_ext/range/blockless_step.rb +++ b/activesupport/lib/active_support/core_ext/range/blockless_step.rb @@ -1,27 +1,11 @@ require 'active_support/core_ext/module/aliasing' class Range - begin - (1..2).step - # Range#step doesn't return an Enumerator - rescue LocalJumpError - # Return an array when step is called without a block. - def step_with_blockless(*args, &block) - if block_given? - step_without_blockless(*args, &block) - else - array = [] - step_without_blockless(*args) { |step| array << step } - array - end - end - else - def step_with_blockless(*args, &block) #:nodoc: - if block_given? - step_without_blockless(*args, &block) - else - step_without_blockless(*args).to_a - end + def step_with_blockless(*args, &block) #:nodoc: + if block_given? + step_without_blockless(*args, &block) + else + step_without_blockless(*args).to_a end end