diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-11-21 16:20:17 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-11-21 22:16:49 +0900 |
commit | 612aa5c24a7c249867bbcd7d6567012aa6a7f4b9 (patch) | |
tree | 35581bf73b35123b08cc2ac9c9f453ab0010ff69 /ext | |
parent | 116920cff8739c49ba469bf243252f503e28f0fd (diff) |
Use class methods of `File` over `Kernel.open` and `IO.read`
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6777
Diffstat (limited to 'ext')
-rwxr-xr-x | ext/extmk.rb | 8 | ||||
-rw-r--r-- | ext/socket/extconf.rb | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index cc560be1f2..cab9a519c1 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -144,7 +144,7 @@ def extmake(target, basedir = 'ext', maybestatic = true) d = target until (d = File.dirname(d)) == '.' if File.exist?("#{$top_srcdir}/#{basedir}/#{d}/extconf.rb") - parent = (/^all:\s*install/ =~ IO.read("#{d}/Makefile") rescue false) + parent = (/^all:\s*install/ =~ File.read("#{d}/Makefile") rescue false) break end end @@ -447,9 +447,8 @@ if $extstatic end for dir in ["ext", File::join($top_srcdir, "ext")] setup = File::join(dir, CONFIG['setup']) - if File.file? setup - f = open(setup) - while line = f.gets() + if (f = File.stat(setup) and f.file? rescue next) + File.foreach(setup) do |line| line.chomp! line.sub!(/#.*$/, '') next if /^\s*$/ =~ line @@ -466,7 +465,6 @@ for dir in ["ext", File::join($top_srcdir, "ext")] end MTIMES << f.mtime $setup = setup - f.close break end end unless $extstatic diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb index 73bbc8e687..37ff216560 100644 --- a/ext/socket/extconf.rb +++ b/ext/socket/extconf.rb @@ -552,7 +552,7 @@ EOS end if !have_macro("IPPROTO_IPV6", headers) && have_const("IPPROTO_IPV6", headers) - IO.read(File.join(File.dirname(__FILE__), "mkconstants.rb")).sub(/\A.*^__END__$/m, '').split(/\r?\n/).grep(/\AIPPROTO_\w*/){$&}.each {|name| + File.read(File.join(File.dirname(__FILE__), "mkconstants.rb")).sub(/\A.*^__END__$/m, '').split(/\r?\n/).grep(/\AIPPROTO_\w*/){$&}.each {|name| have_const(name, headers) unless $defs.include?("-DHAVE_CONST_#{name.upcase}") } end @@ -679,7 +679,7 @@ SRC end end FileUtils.mkdir_p(File.dirname(hdr)) - open(hdr, "w") {|f| f.write(in6)} + File.write(hdr, in6) $distcleanfiles << hdr $distcleandirs << File.dirname(hdr) "done" |