diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2012-11-09 15:24:05 +0100 |
|---|---|---|
| committer | Steve Klabnik <steve@steveklabnik.com> | 2012-11-09 15:57:18 +0100 |
| commit | 88d59de12d9951c0ac18a1e53e52f92c00c15849 (patch) | |
| tree | 071cb9c1beffdd548fb094188c1e128a35022041 /activesupport | |
| parent | 6710f057f9033aec2ef62b961b9a2000a2d499e5 (diff) | |
| download | rails-88d59de12d9951c0ac18a1e53e52f92c00c15849.tar.gz rails-88d59de12d9951c0ac18a1e53e52f92c00c15849.tar.bz2 rails-88d59de12d9951c0ac18a1e53e52f92c00c15849.zip | |
Deprecate Hash#diff.
It's no longer used in Rails any more.
See https://github.com/rails/rails/pull/8142\#issuecomment-10227297 for more
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 3 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/diff.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 61d85543d1..dc84b44dec 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,4 +1,7 @@ ## Rails 4.0.0 (unreleased) ## + +* Deprecate Hash#diff in favor of MiniTest's #diff. *Steve Klabnik* + * Kernel#capture can catch output from subprocesses *Dmitry Vorotilin* * `to_xml` conversions now use builder's `tag!` method instead of explicit invocation of `method_missing`. diff --git a/activesupport/lib/active_support/core_ext/hash/diff.rb b/activesupport/lib/active_support/core_ext/hash/diff.rb index 831dee8ecb..a27c55479a 100644 --- a/activesupport/lib/active_support/core_ext/hash/diff.rb +++ b/activesupport/lib/active_support/core_ext/hash/diff.rb @@ -6,6 +6,7 @@ class Hash # {}.diff(1 => 2) # => {1 => 2} # {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4} def diff(other) + ActiveSupport::Deprecation.warn "Hash#diff is no longer used inside of Rails, and is being deprecated with no replacement. If you're using it to compare hashes for the purpose of testing, please use MiniTest's diff instead." dup. delete_if { |k, v| other[k] == v }. merge!(other.dup.delete_if { |k, v| has_key?(k) }) |