diff options
author | Eric Wong <e@80x24.org> | 2022-01-23 21:28:47 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2022-01-23 21:29:22 +0000 |
commit | 27a288ff1033ae446e1d58d7c510bf9d1cf00961 (patch) | |
tree | c2382eab2223755096ab06e472a2ce73b16d10b8 | |
parent | f9d9927e55d8c1132073af4f8b5dbbf3e04ea87d (diff) | |
download | dtas-27a288ff1033ae446e1d58d7c510bf9d1cf00961.tar.gz |
IO#close is idempotent since Ruby 2.3, so reduce our instruction footprint to save some memory.
-rwxr-xr-x | bin/dtas-readahead | 2 | ||||
-rw-r--r-- | lib/dtas/buffer.rb | 4 | ||||
-rw-r--r-- | test/test_buffer.rb | 2 | ||||
-rw-r--r-- | test/test_unixserver.rb | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/bin/dtas-readahead b/bin/dtas-readahead index 75bfbe8..6da5f88 100755 --- a/bin/dtas-readahead +++ b/bin/dtas-readahead @@ -205,7 +205,7 @@ begin timeout = 0 if timeout < 0 else work.each_value(&:close).clear - fp.close if fp && !fp.closed? + fp.close if fp fp = timeout = nil end r = w.to_io.wait_readable(timeout) diff --git a/lib/dtas/buffer.rb b/lib/dtas/buffer.rb index 54487c5..0688af9 100644 --- a/lib/dtas/buffer.rb +++ b/lib/dtas/buffer.rb @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2020 all contributors <dtas-all@nongnu.org> +# Copyright (C) all contributors <dtas-all@nongnu.org> # License: GPL-3.0+ <https://www.gnu.org/licenses/gpl-3.0.txt> # frozen_string_literal: true require 'io/wait' @@ -45,7 +45,7 @@ class DTAS::Buffer # :nodoc: def __dst_error(dst, e) warn "dropping #{dst.inspect} due to error: #{e.message} (#{e.class})" - dst.close unless dst.closed? + dst.close end # This will modify targets diff --git a/test/test_buffer.rb b/test/test_buffer.rb index b89a090..a47e2d4 100644 --- a/test/test_buffer.rb +++ b/test/test_buffer.rb @@ -11,7 +11,7 @@ class TestBuffer < Testcase @@max_size = nil if @@max_size == 0 def teardown - @to_close.each { |io| io.close unless io.closed? } + @to_close.each(&:close) end def setup diff --git a/test/test_unixserver.rb b/test/test_unixserver.rb index b061af0..7e99b9e 100644 --- a/test/test_unixserver.rb +++ b/test/test_unixserver.rb @@ -21,7 +21,7 @@ class TestUNIXServer < Testcase end def teardown - @clients.each { |io| io.close unless io.closed? } + @clients.each(&:close) if File.exist?(@tmp.path) @tmp.close! else |