aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/json
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 01:03:53 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-01-06 01:04:33 -0300
commitb33bd077fab8e249ba3ddfb7e656c34243c05a1d (patch)
treecc00b02e74d354ffbb47c5fd734d9911065c66b2 /activesupport/lib/active_support/json
parent2958a1e14e1636ae84d3580f4c7a5a7baeab2b8b (diff)
downloadrails-b33bd077fab8e249ba3ddfb7e656c34243c05a1d.tar.gz
rails-b33bd077fab8e249ba3ddfb7e656c34243c05a1d.tar.bz2
rails-b33bd077fab8e249ba3ddfb7e656c34243c05a1d.zip
Remove Array.wrap calls in ActiveSupport
Diffstat (limited to 'activesupport/lib/active_support/json')
-rw-r--r--activesupport/lib/active_support/json/encoding.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/json/encoding.rb b/activesupport/lib/active_support/json/encoding.rb
index 07b6a940c6..0e1bf4c40b 100644
--- a/activesupport/lib/active_support/json/encoding.rb
+++ b/activesupport/lib/active_support/json/encoding.rb
@@ -5,7 +5,6 @@ require 'active_support/ordered_hash'
require 'bigdecimal'
require 'active_support/core_ext/big_decimal/conversions' # for #to_s
-require 'active_support/core_ext/array/wrap'
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/hash/slice'
require 'active_support/core_ext/object/instance_variables'
@@ -228,9 +227,9 @@ class Hash
# create a subset of the hash by applying :only or :except
subset = if options
if attrs = options[:only]
- slice(*Array.wrap(attrs))
+ slice(*Array(attrs))
elsif attrs = options[:except]
- except(*Array.wrap(attrs))
+ except(*Array(attrs))
else
self
end