Remove warnings on Ruby 2.1

Conflicts: activesupport/lib/active_support/hash_with_indifferent_access.rb
rails · Feb 26, 2014 · 6b927b8 · 6b927b8
1 parent fc2641d
commit 6b927b8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -228,7 +228,11 @@ def deep_symbolize_keys; to_hash.deep_symbolize_keys end
     def to_options!; self end
 
     def select(*args, &block)
-      dup.select!(*args, &block)
+      dup.tap { |hash| hash.select!(*args, &block)}
+    end
+
+    def reject(*args, &block)
+      dup.tap { |hash| hash.reject!(*args, &block)}
     end
 
     # Convert to a regular hash with string keys.

diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
@@ -28,6 +28,10 @@ def encode_with(coder)
       coder.represent_seq '!omap', map { |k,v| { k => v } }
     end
 
+    def reject(*args, &block)
+      dup.tap { |hash| hash.reject!(*args, &block)}
+    end
+
     def nested_under_indifferent_access
       self
     end