TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #28930 from kamipo/use_flat_map

Browse Source 
Use `flat_map` rather than `map(&:...).flatten`
This commit is contained in:
Rafael França 2017-05-01 17:22:14 -07:00 committed by GitHub
commit 8d4d6a706d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/reflection.rb
View File

@ -212,7 +212,7 @@ def klass_join_scope(table, predicate_builder) # :nodoc:
end
def constraints
chain.map(&:scopes).flatten
chain.flat_map(&:scopes)
end
def counter_cache_column

4
activesupport/lib/active_support/i18n_railtie.rb
View File

@ -42,7 +42,7 @@ def self.initialize_i18n(app)
case setting
when :railties_load_path
reloadable_paths = value
app.config.i18n.load_path.unshift(*value.map(&:existent).flatten)
app.config.i18n.load_path.unshift(*value.flat_map(&:existent))
when :load_path
I18n.load_path += value
else
@ -58,7 +58,7 @@ def self.initialize_i18n(app)
directories = watched_dirs_with_extensions(reloadable_paths)
reloader = app.config.file_watcher.new(I18n.load_path.dup, directories) do
I18n.load_path.keep_if { |p| File.exist?(p) }
I18n.load_path |= reloadable_paths.map(&:existent).flatten
I18n.load_path |= reloadable_paths.flat_map(&:existent)
I18n.reload!
end