ruby-changes:59924
From: Nobuyoshi <ko1@a...>
Date: Wed, 5 Feb 2020 09:42:31 +0900 (JST)
Subject: [ruby-changes:59924] c6cd4206df (master): Get rid of nested string interpolations to be editor-friendly
https://git.ruby-lang.org/ruby.git/commit/?id=c6cd4206df From c6cd4206df516da1c6b1935f045e22e0ef7f0709 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Wed, 5 Feb 2020 08:47:47 +0900 Subject: Get rid of nested string interpolations to be editor-friendly diff --git a/tool/lib/test/unit/core_assertions.rb b/tool/lib/test/unit/core_assertions.rb index 8911fad..aa5c7d6 100644 --- a/tool/lib/test/unit/core_assertions.rb +++ b/tool/lib/test/unit/core_assertions.rb @@ -110,14 +110,16 @@ module Test https://github.com/ruby/ruby/blob/trunk/tool/lib/test/unit/core_assertions.rb#L110 file ||= loc.path line ||= loc.lineno end - if /mswin|mingw/ !~ RUBY_PLATFORM + if /mswin|mingw/ =~ RUBY_PLATFORM + res_out = "STDOUT" + else res_p, res_c = IO.pipe opt[res_c.fileno] = res_c.fileno - res_fd = res_c.fileno + res_out = "IO.new(#{res_c.fileno}, 'w')" end src = <<eom # -*- coding: #{line += __LINE__; src.encoding}; -*- - require "test/unit";out=#{res_fd ? "IO.new(#{res_fd})" : "STDOUT"};include Test::Unit::Assertions;require #{(__dir__ + "/core_assertions").dump};include Test::Unit::CoreAssertions + require "test/unit";out=#{res_out};include Test::Unit::Assertions;require #{(__dir__ + "/core_assertions").dump};include Test::Unit::CoreAssertions END { out.puts [Marshal.dump($!)].pack('m'), "assertions=\#{self._assertions}" } -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/