mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
avoids a ton o warnings activesupport/lib/active_support/dependencies.rb:239: warning: loading in progress, circular require considered harmful ... activesupport/lib/active_support/core_ext/hash/indifferent_access.rb while running the suite in Ruby 1.9.2
This commit is contained in:
parent
c510f05967
commit
eab4860e9b
2 changed files with 7 additions and 4 deletions
|
@ -7,8 +7,6 @@ class Hash
|
|||
# {:a => 1}.with_indifferent_access["a"] # => 1
|
||||
#
|
||||
def with_indifferent_access
|
||||
hash = ActiveSupport::HashWithIndifferentAccess.new(self)
|
||||
hash.default = self.default
|
||||
hash
|
||||
ActiveSupport::HashWithIndifferentAccess.new_from_hash_copying_default(self)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
require 'active_support/core_ext/hash/indifferent_access'
|
||||
require 'active_support/core_ext/hash/keys'
|
||||
|
||||
# This class has dubious semantics and we only have it so that
|
||||
|
@ -28,6 +27,12 @@ module ActiveSupport
|
|||
end
|
||||
end
|
||||
|
||||
def self.new_from_hash_copying_default(hash)
|
||||
ActiveSupport::HashWithIndifferentAccess.new(hash).tap do |new_hash|
|
||||
new_hash.default = hash.default
|
||||
end
|
||||
end
|
||||
|
||||
alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
|
||||
alias_method :regular_update, :update unless method_defined?(:regular_update)
|
||||
|
||||
|
|
Loading…
Reference in a new issue