aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
diff options
context:
space:
mode:
authorErik Michaels-Ober <sferik@gmail.com>2014-03-03 19:23:12 -0800
committerErik Michaels-Ober <sferik@gmail.com>2014-03-03 19:23:12 -0800
commit817fe31196dd59ee31f71ef1740122b6759cf16d (patch)
tree27ab19e734f21b64105c252ab88af009974e2c08 /actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
parentffcc6172b4d40ca7c8b02fd298c679b5bcf5787b (diff)
downloadrails-817fe31196dd59ee31f71ef1740122b6759cf16d.tar.gz
rails-817fe31196dd59ee31f71ef1740122b6759cf16d.tar.bz2
rails-817fe31196dd59ee31f71ef1740122b6759cf16d.zip
Replace map.flatten with flat_map in actionpack
Diffstat (limited to 'actionpack/lib/action_dispatch/journey/gtg/transition_table.rb')
-rw-r--r--actionpack/lib/action_dispatch/journey/gtg/transition_table.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
index a5b19fcf06..e6212b1ee2 100644
--- a/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
+++ b/actionpack/lib/action_dispatch/journey/gtg/transition_table.rb
@@ -114,8 +114,8 @@ module ActionDispatch
end
def states
- ss = @string_states.keys + @string_states.values.map(&:values).flatten
- rs = @regexp_states.keys + @regexp_states.values.map(&:values).flatten
+ ss = @string_states.keys + @string_states.values.flat_map(&:values)
+ rs = @regexp_states.keys + @regexp_states.values.flat_map(&:values)
(ss + rs).uniq
end
@@ -143,11 +143,11 @@ module ActionDispatch
def move_regexp(t, a)
return [] if t.empty?
- t.map { |s|
+ t.flat_map { |s|
if states = @regexp_states[s]
states.map { |re, v| re === a ? v : nil }
end
- }.flatten.compact.uniq
+ }.compact.uniq
end
def move_string(t, a)