diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-22 02:34:50 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-22 02:34:50 +0000 |
| commit | 5b1c06c74b65e12c8e552bacf6faed5c0b2826cd (patch) | |
| tree | 4c378096ded924eea76b20eaf02ac81c430932f6 /ext/psych/lib | |
| parent | 7b876e65ed79d9ca4a22f7731a463ee30e35b30b (diff) | |
* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
part of YAML 1.1, so they should be supported. Remove warning and
merge keys to parent. [ruby-core:34679]
* test/psych/test_merge_keys.rb: test for merge keys
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/lib')
| -rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index 745338ad99..b5bec54af5 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -188,13 +188,7 @@ module Psych key = accept(k) if key == '<<' && Nodes::Alias === v - # FIXME: remove this when "<<" syntax is deprecated - if $VERBOSE - where = caller.find { |x| x !~ /psych/ } - warn where - warn "\"<<: *#{v.anchor}\" is no longer supported, please switch to \"*#{v.anchor}\"" - end - return accept(v) + hash.merge! accept(v) else hash[key] = accept(v) end |