summaryrefslogtreecommitdiffhomepage
path: root/mrblib
diff options
context:
space:
mode:
authoryui-knk <[email protected]>2014-05-10 10:18:15 +0900
committeryui-knk <[email protected]>2014-05-10 10:18:15 +0900
commit658a00ba4927b433420c9b26dcbc2365fb657f2b (patch)
treea66c0c883da1e17ccddf28d8e2bdf93b2c210a0f /mrblib
parente07a3731d1c7198eb5b443818c0f6a0601ca790d (diff)
downloadmruby-658a00ba4927b433420c9b26dcbc2365fb657f2b.tar.gz
mruby-658a00ba4927b433420c9b26dcbc2365fb657f2b.zip
Change to raise TypeError (Hash#merge, #merge!)
Diffstat (limited to 'mrblib')
-rw-r--r--mrblib/hash.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/mrblib/hash.rb b/mrblib/hash.rb
index 5828a13eb..315a0c86e 100644
--- a/mrblib/hash.rb
+++ b/mrblib/hash.rb
@@ -179,7 +179,7 @@ class Hash
# ISO 15.2.13.4.22
def merge(other, &block)
h = {}
- raise "can't convert argument into Hash" unless other.respond_to?(:to_hash)
+ raise TypeError, "can't convert argument into Hash" unless other.respond_to?(:to_hash)
other = other.to_hash
self.each_key{|k| h[k] = self[k]}
if block