Skip to content

Commit 449cc25

Browse files
committed
Use File instead of IO, for read/write singleton methods
1 parent 90cb2bb commit 449cc25

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tool/make-snapshot

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ def package(vcs, rev, destdir, tmp = nil)
334334
FileUtils.rm(file, verbose: $VERBOSE)
335335
end
336336

337-
status = IO.read(File.dirname(__FILE__) + "/prereq.status")
337+
status = File.read(File.dirname(__FILE__) + "/prereq.status")
338338
Dir.chdir(tmp) if tmp
339339

340340
if !File.directory?(v)
@@ -346,10 +346,10 @@ def package(vcs, rev, destdir, tmp = nil)
346346
File.open("#{v}/revision.h", "wb") {|f|
347347
f.puts vcs.revision_header(revision, modified)
348348
}
349-
version ||= (versionhdr = IO.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
349+
version ||= (versionhdr = File.read("#{v}/version.h"))[RUBY_VERSION_PATTERN, 1]
350350
version ||=
351351
begin
352-
include_ruby_versionhdr = IO.read("#{v}/include/ruby/version.h")
352+
include_ruby_versionhdr = File.read("#{v}/include/ruby/version.h")
353353
api_major_version = include_ruby_versionhdr[/^\#define\s+RUBY_API_VERSION_MAJOR\s+([\d.]+)/, 1]
354354
api_minor_version = include_ruby_versionhdr[/^\#define\s+RUBY_API_VERSION_MINOR\s+([\d.]+)/, 1]
355355
version_teeny = versionhdr[/^\#define\s+RUBY_VERSION_TEENY\s+(\d+)/, 1]
@@ -358,14 +358,14 @@ def package(vcs, rev, destdir, tmp = nil)
358358
version or return
359359
if patchlevel
360360
unless tag.empty?
361-
versionhdr ||= IO.read("#{v}/version.h")
361+
versionhdr ||= File.read("#{v}/version.h")
362362
patchlevel = versionhdr[/^\#define\s+RUBY_PATCHLEVEL\s+(\d+)/, 1]
363363
tag = (patchlevel ? "p#{patchlevel}" : vcs.revision_name(revision))
364364
end
365365
elsif prerelease
366-
versionhdr ||= IO.read("#{v}/version.h")
366+
versionhdr ||= File.read("#{v}/version.h")
367367
versionhdr.sub!(/^\#\s*define\s+RUBY_PATCHLEVEL_STR\s+"\K.+?(?=")/, tag) or raise "no match of RUBY_PATCHLEVEL_STR to replace"
368-
IO.write("#{v}/version.h", versionhdr)
368+
File.write("#{v}/version.h", versionhdr)
369369
else
370370
tag ||= vcs.revision_name(revision)
371371
end
@@ -439,11 +439,11 @@ def package(vcs, rev, destdir, tmp = nil)
439439
clean.add("autom4te.cache")
440440
clean.add("enc/unicode/data")
441441
print "creating prerequisites..."
442-
if File.file?("common.mk") && /^prereq/ =~ commonmk = IO.read("common.mk")
442+
if File.file?("common.mk") && /^prereq/ =~ commonmk = File.read("common.mk")
443443
puts
444444
extout = clean.add('tmp')
445445
begin
446-
status = IO.read("tool/prereq.status")
446+
status = File.read("tool/prereq.status")
447447
rescue Errno::ENOENT
448448
# use fallback file
449449
end
@@ -456,7 +456,7 @@ def package(vcs, rev, destdir, tmp = nil)
456456
File.binwrite("#{defaults}/ruby.rb", "")
457457
miniruby = ENV['MINIRUBY'] + " -I. -I#{extout} -rcross"
458458
baseruby = ENV["BASERUBY"]
459-
mk = (IO.read("template/Makefile.in") rescue IO.read("Makefile.in")).
459+
mk = (File.read("template/Makefile.in") rescue File.read("Makefile.in")).
460460
gsub(/^@.*\n/, '')
461461
vars = {
462462
"EXTOUT"=>extout,

0 commit comments

Comments
 (0)