From cc94722ddf392bf486b73cf847a7bc2e5e87550a Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 8 Oct 2005 10:45:52 +0000 Subject: * lib/scanf.rb (Scanf::FormatSpecifier#letter, #width): use matched substring directly. * ext/nkf/lib/kconv.rb (Kconv.conv): get rid of nil.to_a. * test/ruby/test_assignment.rb, test/ruby/test_iterator.rb: followed change of sample/test.rb. * test/net/http/test_http.rb: removed superfluous splatting stars. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/nkf/lib/kconv.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext') diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb index a5fc9a28e..44a28c86e 100644 --- a/ext/nkf/lib/kconv.rb +++ b/ext/nkf/lib/kconv.rb @@ -113,7 +113,7 @@ module Kconv to = symbol_to_option(option[0]) from = symbol_to_option(option[1]).to_s.sub(/(-[jesw])/o){$1.upcase} - opt = option[2..-1].to_a.flatten.map{|x|symbol_to_option(x)}.compact.join(' ') + opt = option[2..-1] and opt = opt.flatten.map{|x|symbol_to_option(x)}.compact.join(' ') nkf_opt = '-x -m0 %s %s %s' % [to, from, opt] result = ::NKF::nkf( nkf_opt, str) -- cgit