diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-17 18:17:46 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-17 18:17:46 +0000 |
| commit | f595568e475b225b2ee5cce9d4667ba551177ee6 (patch) | |
| tree | f664bc35af3f156f02cf3fd2fffefb3e77827250 /ext/psych/yaml | |
| parent | c934771ca9ca54bb20f01b818035873594793dfa (diff) | |
| download | ruby-f595568e475b225b2ee5cce9d4667ba551177ee6.tar.gz | |
* ext/psych/lib/psych.rb: bump psych version.
* ext/psych/psych.gemspec: ditto
* ext/psych/yaml/scanner.c: add latest libyaml change.
* test/psych/helper.rb: support newer minitest
* test/psych/test_to_yaml_properties.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/yaml')
| -rw-r--r-- | ext/psych/yaml/scanner.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c index 08ad8edb45..8d81590e59 100644 --- a/ext/psych/yaml/scanner.c +++ b/ext/psych/yaml/scanner.c @@ -1106,13 +1106,6 @@ yaml_parser_save_simple_key(yaml_parser_t *parser) && parser->indent == (ptrdiff_t)parser->mark.column); /* - * A simple key is required only when it is the first token in the current - * line. Therefore it is always allowed. But we add a check anyway. - */ - - assert(parser->simple_key_allowed || !required); /* Impossible. */ - - /* * If the current position may start a simple key, save it. */ |