diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-10-05 12:07:16 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-10-05 12:07:16 -0300 |
| commit | a0613ad8a9773c76a9b0a256f7099fde35823674 (patch) | |
| tree | ac866e7a5c8fa4c15f025759dd0ed1dccb54d311 /activesupport | |
| parent | abf8de85519141496a6773310964ec03f6106f3f (diff) | |
| download | rails-a0613ad8a9773c76a9b0a256f7099fde35823674.tar.gz rails-a0613ad8a9773c76a9b0a256f7099fde35823674.tar.bz2 rails-a0613ad8a9773c76a9b0a256f7099fde35823674.zip | |
Revert "Use flat_map { } instead of map {}.flatten"
This reverts commit abf8de85519141496a6773310964ec03f6106f3f.
We should take a deeper look to those cases flat_map doesn't do deep
flattening.
irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten
=> [1, 3, 1, 2]
irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i}
=> [[1, 3], [1, 2]]
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/multibyte/unicode.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/multibyte/unicode.rb b/activesupport/lib/active_support/multibyte/unicode.rb index d7a403c45b..f49ca47f14 100644 --- a/activesupport/lib/active_support/multibyte/unicode.rb +++ b/activesupport/lib/active_support/multibyte/unicode.rb @@ -219,9 +219,9 @@ module ActiveSupport # encoding is entirely CP1252 or ISO-8859-1. def tidy_bytes(string, force = false) if force - return string.unpack("C*").flat_map do |b| + return string.unpack("C*").map do |b| tidy_byte(b) - end.compact.pack("C*").unpack("U*").pack("U*") + end.flatten.compact.pack("C*").unpack("U*").pack("U*") end bytes = string.unpack("C*") |