ruby-changes:47212
From: hsbt <ko1@a...>
Date: Fri, 14 Jul 2017 15:16:13 +0900 (JST)
Subject: [ruby-changes:47212] hsbt:r59327 (trunk): Merge psych-3.0.0.beta3 from ruby/psych.
hsbt 2017-07-14 15:15:58 +0900 (Fri, 14 Jul 2017) New Revision: 59327 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59327 Log: Merge psych-3.0.0.beta3 from ruby/psych. * Rely on encoding tags to determine if string should be dumped as binary. https://github.com/ruby/psych/commit/8949a47b8cee31e03e21608406ba116adcf74054 * Specify "frozen_string_literal: true". * Support to binary release for mingw32 platform. Modified files: trunk/ext/psych/extconf.rb trunk/ext/psych/lib/psych/class_loader.rb trunk/ext/psych/lib/psych/coder.rb trunk/ext/psych/lib/psych/core_ext.rb trunk/ext/psych/lib/psych/exception.rb trunk/ext/psych/lib/psych/handler.rb trunk/ext/psych/lib/psych/handlers/document_stream.rb trunk/ext/psych/lib/psych/handlers/recorder.rb trunk/ext/psych/lib/psych/json/ruby_events.rb trunk/ext/psych/lib/psych/json/stream.rb trunk/ext/psych/lib/psych/json/tree_builder.rb trunk/ext/psych/lib/psych/json/yaml_events.rb trunk/ext/psych/lib/psych/nodes/alias.rb trunk/ext/psych/lib/psych/nodes/document.rb trunk/ext/psych/lib/psych/nodes/mapping.rb trunk/ext/psych/lib/psych/nodes/node.rb trunk/ext/psych/lib/psych/nodes/scalar.rb trunk/ext/psych/lib/psych/nodes/sequence.rb trunk/ext/psych/lib/psych/nodes/stream.rb trunk/ext/psych/lib/psych/nodes.rb trunk/ext/psych/lib/psych/omap.rb trunk/ext/psych/lib/psych/parser.rb trunk/ext/psych/lib/psych/scalar_scanner.rb trunk/ext/psych/lib/psych/set.rb trunk/ext/psych/lib/psych/stream.rb trunk/ext/psych/lib/psych/streaming.rb trunk/ext/psych/lib/psych/syntax_error.rb trunk/ext/psych/lib/psych/tree_builder.rb trunk/ext/psych/lib/psych/versions.rb trunk/ext/psych/lib/psych/visitors/depth_first.rb trunk/ext/psych/lib/psych/visitors/emitter.rb trunk/ext/psych/lib/psych/visitors/json_tree.rb trunk/ext/psych/lib/psych/visitors/to_ruby.rb trunk/ext/psych/lib/psych/visitors/visitor.rb trunk/ext/psych/lib/psych/visitors/yaml_tree.rb trunk/ext/psych/lib/psych/visitors.rb trunk/ext/psych/lib/psych/y.rb trunk/ext/psych/lib/psych.rb trunk/ext/psych/psych.gemspec trunk/test/psych/handlers/test_recorder.rb trunk/test/psych/helper.rb trunk/test/psych/json/test_stream.rb trunk/test/psych/nodes/test_enumerable.rb trunk/test/psych/test_alias_and_anchor.rb trunk/test/psych/test_array.rb trunk/test/psych/test_boolean.rb trunk/test/psych/test_class.rb trunk/test/psych/test_coder.rb trunk/test/psych/test_date_time.rb trunk/test/psych/test_deprecated.rb trunk/test/psych/test_document.rb trunk/test/psych/test_emitter.rb trunk/test/psych/test_encoding.rb trunk/test/psych/test_exception.rb trunk/test/psych/test_hash.rb trunk/test/psych/test_json_tree.rb trunk/test/psych/test_marshalable.rb trunk/test/psych/test_merge_keys.rb trunk/test/psych/test_nil.rb trunk/test/psych/test_null.rb trunk/test/psych/test_numeric.rb trunk/test/psych/test_object.rb trunk/test/psych/test_object_references.rb trunk/test/psych/test_omap.rb trunk/test/psych/test_parser.rb trunk/test/psych/test_psych.rb trunk/test/psych/test_safe_load.rb trunk/test/psych/test_scalar.rb trunk/test/psych/test_scalar_scanner.rb trunk/test/psych/test_serialize_subclasses.rb trunk/test/psych/test_set.rb trunk/test/psych/test_stream.rb trunk/test/psych/test_string.rb trunk/test/psych/test_struct.rb trunk/test/psych/test_symbol.rb trunk/test/psych/test_tainted.rb trunk/test/psych/test_tree_builder.rb trunk/test/psych/test_yaml.rb trunk/test/psych/test_yamldbm.rb trunk/test/psych/test_yamlstore.rb trunk/test/psych/visitors/test_depth_first.rb trunk/test/psych/visitors/test_emitter.rb trunk/test/psych/visitors/test_to_ruby.rb trunk/test/psych/visitors/test_yaml_tree.rb Index: ext/psych/lib/psych/versions.rb =================================================================== --- ext/psych/lib/psych/versions.rb (revision 59326) +++ ext/psych/lib/psych/versions.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/versions.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych # The version is Psych you're using VERSION = '3.0.0.beta2' Index: ext/psych/psych.gemspec =================================================================== --- ext/psych/psych.gemspec (revision 59326) +++ ext/psych/psych.gemspec (revision 59327) @@ -1,4 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/psych.gemspec#L1 # -*- encoding: utf-8 -*- +# frozen_string_literal: true Gem::Specification.new do |s| s.name = "psych" @@ -17,7 +18,25 @@ DESCRIPTION https://github.com/ruby/ruby/blob/trunk/ext/psych/psych.gemspec#L18 s.require_paths = ["lib"] # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } - s.files = [".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/psych/.gitignore", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h", "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h", "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h", "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c", "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c", "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h", "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/exception.rb", "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/ps ych/handlers/recorder.rb", "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb", "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb", "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb", "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb", "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb", "lib/psych/tree_builder.rb", "lib/psych/versions.rb", "lib/psych/visitors.rb","lib/psych/visitors/depth_first.rb", "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb", "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "psych.gemspec"] + s.files = [ + ".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console", + "bin/setup", "ext/psych/.gitignore", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h", + "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h", + "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h", + "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c", + "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c", + "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h", + "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/exception.rb", + "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb", + "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb", + "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb", + "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb", + "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb", + "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb", + "lib/psych/tree_builder.rb", "lib/psych/versions.rb", "lib/psych/visitors.rb","lib/psych/visitors/depth_first.rb", + "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb", + "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "psych.gemspec" + ] s.rdoc_options = ["--main", "README.md"] s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md"] @@ -31,11 +50,15 @@ DESCRIPTION https://github.com/ruby/ruby/blob/trunk/ext/psych/psych.gemspec#L50 if RUBY_ENGINE == 'jruby' s.platform = 'java' - s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"] + s.files.concat [ + "ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", + "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar" + ] s.requirements = "jar org.yaml:snakeyaml, 1.18" s.add_dependency 'jar-dependencies', '>= 0.1.7' s.add_development_dependency 'ruby-maven' else s.extensions = ["ext/psych/extconf.rb"] + s.add_development_dependency 'rake-compiler-dock', ">= 0.6.1" end end Index: ext/psych/lib/psych/nodes/alias.rb =================================================================== --- ext/psych/lib/psych/nodes/alias.rb (revision 59326) +++ ext/psych/lib/psych/nodes/alias.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/nodes/alias.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych module Nodes ### Index: ext/psych/lib/psych/nodes/stream.rb =================================================================== --- ext/psych/lib/psych/nodes/stream.rb (revision 59326) +++ ext/psych/lib/psych/nodes/stream.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/nodes/stream.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych module Nodes ### Index: ext/psych/lib/psych/json/tree_builder.rb =================================================================== --- ext/psych/lib/psych/json/tree_builder.rb (revision 59326) +++ ext/psych/lib/psych/json/tree_builder.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/json/tree_builder.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/json/yaml_events' module Psych Index: ext/psych/lib/psych/json/stream.rb =================================================================== --- ext/psych/lib/psych/json/stream.rb (revision 59326) +++ ext/psych/lib/psych/json/stream.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/json/stream.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/json/ruby_events' require 'psych/json/yaml_events' Index: ext/psych/lib/psych/core_ext.rb =================================================================== --- ext/psych/lib/psych/core_ext.rb (revision 59326) +++ ext/psych/lib/psych/core_ext.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/core_ext.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true class Object def self.yaml_tag url Psych.add_tag(url, self) Index: ext/psych/lib/psych.rb =================================================================== --- ext/psych/lib/psych.rb (revision 59326) +++ ext/psych/lib/psych.rb (revision 59327) @@ -1,11 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/versions' case RUBY_ENGINE when 'jruby' require 'psych_jars' org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false) else - require 'psych.so' + begin + require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so" + rescue LoadError + require 'psych.so' + end end require 'psych/nodes' require 'psych/streaming' Index: test/psych/test_serialize_subclasses.rb =================================================================== --- test/psych/test_serialize_subclasses.rb (revision 59326) +++ test/psych/test_serialize_subclasses.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/test/psych/test_serialize_subclasses.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require_relative 'helper' module Psych Index: ext/psych/lib/psych/handler.rb =================================================================== --- ext/psych/lib/psych/handler.rb (revision 59326) +++ ext/psych/lib/psych/handler.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/handler.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych ### # Psych::Handler is an abstract base class that defines the events used Index: ext/psych/lib/psych/scalar_scanner.rb =================================================================== --- ext/psych/lib/psych/scalar_scanner.rb (revision 59326) +++ ext/psych/lib/psych/scalar_scanner.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/scalar_scanner.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'strscan' module Psych Index: ext/psych/lib/psych/visitors/visitor.rb =================================================================== --- ext/psych/lib/psych/visitors/visitor.rb (revision 59326) +++ ext/psych/lib/psych/visitors/visitor.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/visitor.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych module Visitors class Visitor Index: ext/psych/lib/psych/visitors/yaml_tree.rb =================================================================== --- ext/psych/lib/psych/visitors/yaml_tree.rb (revision 59326) +++ ext/psych/lib/psych/visitors/yaml_tree.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/yaml_tree.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/tree_builder' require 'psych/scalar_scanner' require 'psych/class_loader' @@ -321,7 +321,7 @@ module Psych https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/yaml_tree.rb#L321 end @emitter.scalar o, nil, tag, plain, quote, style else - maptag = '!ruby/string' + maptag = '!ruby/string'.dup maptag << ":#{o.class}" unless o.class == ::String register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK) @@ -378,14 +378,18 @@ module Psych https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/yaml_tree.rb#L378 def visit_Array o if o.class == ::Array - register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK) - o.each { |c| accept c } - @emitter.end_sequence + visit_Enumerator o else visit_array_subclass o end end + def visit_Enumerator o + register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK) + o.each { |c| accept c } + @emitter.end_sequence + end + def visit_NilClass o @emitter.scalar('', nil, 'tag:yaml.org,2002:null', true, false, Nodes::Scalar::ANY) end @@ -411,15 +415,9 @@ module Psych https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/yaml_tree.rb#L415 end private - # FIXME: Remove the index and count checks in Psych 3.0 - NULL = "\x00" - BINARY_RANGE = "\x00-\x7F" - WS_RANGE = "^ -~\t\r\n" def binary? string - (string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?) || - string.index(NULL) || - string.count(BINARY_RANGE, WS_RANGE).fdiv(string.length) > 0.3 + string.encoding == Encoding::ASCII_8BIT && !string.ascii_only? end def visit_array_subclass o Index: ext/psych/lib/psych/visitors/to_ruby.rb =================================================================== --- ext/psych/lib/psych/visitors/to_ruby.rb (revision 59326) +++ ext/psych/lib/psych/visitors/to_ruby.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/to_ruby.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/scalar_scanner' require 'psych/class_loader' require 'psych/exception' Index: ext/psych/lib/psych/visitors/json_tree.rb =================================================================== --- ext/psych/lib/psych/visitors/json_tree.rb (revision 59326) +++ ext/psych/lib/psych/visitors/json_tree.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/json_tree.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/json/ruby_events' module Psych Index: ext/psych/lib/psych/visitors/emitter.rb =================================================================== --- ext/psych/lib/psych/visitors/emitter.rb (revision 59326) +++ ext/psych/lib/psych/visitors/emitter.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/emitter.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych module Visitors class Emitter < Psych::Visitors::Visitor Index: ext/psych/lib/psych/visitors/depth_first.rb =================================================================== --- ext/psych/lib/psych/visitors/depth_first.rb (revision 59326) +++ ext/psych/lib/psych/visitors/depth_first.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors/depth_first.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych module Visitors class DepthFirst < Psych::Visitors::Visitor Index: ext/psych/lib/psych/visitors.rb =================================================================== --- ext/psych/lib/psych/visitors.rb (revision 59326) +++ ext/psych/lib/psych/visitors.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/visitors.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/visitors/visitor' require 'psych/visitors/to_ruby' require 'psych/visitors/emitter' Index: ext/psych/lib/psych/streaming.rb =================================================================== --- ext/psych/lib/psych/streaming.rb (revision 59326) +++ ext/psych/lib/psych/streaming.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/streaming.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych module Streaming module ClassMethods Index: ext/psych/lib/psych/stream.rb =================================================================== --- ext/psych/lib/psych/stream.rb (revision 59326) +++ ext/psych/lib/psych/stream.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/stream.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych ### # Psych::Stream is a streaming YAML emitter. It will not buffer your YAML, Index: ext/psych/lib/psych/set.rb =================================================================== --- ext/psych/lib/psych/set.rb (revision 59326) +++ ext/psych/lib/psych/set.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/set.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych class Set < ::Hash end Index: ext/psych/lib/psych/class_loader.rb =================================================================== --- ext/psych/lib/psych/class_loader.rb (revision 59326) +++ ext/psych/lib/psych/class_loader.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/class_loader.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/omap' require 'psych/set' Index: ext/psych/lib/psych/parser.rb =================================================================== --- ext/psych/lib/psych/parser.rb (revision 59326) +++ ext/psych/lib/psych/parser.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/parser.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych ### # YAML event parser class. This class parses a YAML document and calls Index: ext/psych/lib/psych/omap.rb =================================================================== --- ext/psych/lib/psych/omap.rb (revision 59326) +++ ext/psych/lib/psych/omap.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/omap.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych class Omap < ::Hash end Index: ext/psych/lib/psych/coder.rb =================================================================== --- ext/psych/lib/psych/coder.rb (revision 59326) +++ ext/psych/lib/psych/coder.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/coder.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych ### # If an object defines +encode_with+, then an instance of Psych::Coder will Index: ext/psych/lib/psych/handlers/recorder.rb =================================================================== --- ext/psych/lib/psych/handlers/recorder.rb (revision 59326) +++ ext/psych/lib/psych/handlers/recorder.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/handlers/recorder.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/handler' module Psych Index: ext/psych/lib/psych/handlers/document_stream.rb =================================================================== --- ext/psych/lib/psych/handlers/document_stream.rb (revision 59326) +++ ext/psych/lib/psych/handlers/document_stream.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/handlers/document_stream.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true require 'psych/tree_builder' module Psych Index: ext/psych/lib/psych/exception.rb =================================================================== --- ext/psych/lib/psych/exception.rb (revision 59326) +++ ext/psych/lib/psych/exception.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/exception.rb#L1 -# frozen_string_literal: false +# frozen_string_literal: true module Psych class Exception < RuntimeError end Index: ext/psych/lib/psych/syntax_error.rb =================================================================== --- ext/psych/lib/psych/syntax_error.rb (revision 59326) +++ ext/psych/lib/psych/syntax_error.rb (revision 59327) @@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/psych/lib/psych/syntax_error.rb#L1 -# frozen_string_literal: false +# frozen_string_lite (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/