diff options
| author | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-03-22 20:02:39 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2017-03-27 10:12:18 +0900 |
| commit | f6e4d772ec439b47077a18920cbb4bcb7400c5f1 (patch) | |
| tree | 8da5187d0619c43b784e531b02477560e1579f0e | |
| parent | 7c7f78c503af21f884429d7b4ae3f4694f17d6dc (diff) | |
| download | psych-f6e4d772ec439b47077a18920cbb4bcb7400c5f1.tar.gz | |
Removed Module#psych_yaml_as
| -rw-r--r-- | lib/psych/core_ext.rb | 3 | ||||
| -rw-r--r-- | test/psych/test_deprecated.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/psych/core_ext.rb b/lib/psych/core_ext.rb index 4bfd7bd..dbf27ee 100644 --- a/lib/psych/core_ext.rb +++ b/lib/psych/core_ext.rb @@ -14,6 +14,7 @@ class Object end end +<<<<<<< HEAD class Module def yaml_as url return if caller[0].end_with?('rubytypes.rb') @@ -24,6 +25,8 @@ class Module end end +======= +>>>>>>> Removed Module#psych_yaml_as if defined?(::IRB) require 'psych/y' end diff --git a/test/psych/test_deprecated.rb b/test/psych/test_deprecated.rb index e019cfb..d09ff82 100644 --- a/test/psych/test_deprecated.rb +++ b/test/psych/test_deprecated.rb @@ -111,6 +111,7 @@ module Psych assert_equal 'some string', coder.scalar assert_equal :scalar, coder.type end +<<<<<<< HEAD class YamlAs TestCase.suppress_warning do @@ -121,5 +122,7 @@ module Psych def test_yaml_as assert_match(/helloworld/, Psych.dump(YamlAs.new)) end +======= +>>>>>>> Removed Module#psych_yaml_as end end |