about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2017-11-14 23:00:16 +0000
committerEric Wong <e@80x24.org>2017-11-14 23:00:16 +0000
commitfc10a4c09318a1402e5f9f1c770b1f772c12def0 (patch)
tree58e3d4d337a30a6e985a2227f961ed92cbb62edd
parent55fbe513ff4f9a113af3a08852364e65096bd307 (diff)
downloadyahns-fc10a4c09318a1402e5f9f1c770b1f772c12def0.tar.gz
Current (tested r60757) ruby trunk warns in a few more places than
2.4.x did, so clean them up.
-rw-r--r--extras/autoindex.rb4
-rw-r--r--test/test_mt_accept.rb2
2 files changed, 2 insertions, 4 deletions
diff --git a/extras/autoindex.rb b/extras/autoindex.rb
index 238edd9..45b80cf 100644
--- a/extras/autoindex.rb
+++ b/extras/autoindex.rb
@@ -56,7 +56,7 @@ class Autoindex
     case env["REQUEST_METHOD"]
     when "GET", "HEAD"
       # try to serve the static file, first
-      status, headers, body = res = @app.call(env)
+      status, _, body = res = @app.call(env)
       return res if status.to_i != 404
 
       path_info = env["PATH_INFO"]
@@ -78,7 +78,7 @@ class Autoindex
       tryenv = env.dup
       @index.each do |base|
         tryenv["PATH_INFO"] = "#{path_info}#{base}"
-        status, headers, body = res = @app.call(tryenv)
+        status, _, body = res = @app.call(tryenv)
         return res if status.to_i != 404
       end
 
diff --git a/test/test_mt_accept.rb b/test/test_mt_accept.rb
index aa2867f..321d46c 100644
--- a/test/test_mt_accept.rb
+++ b/test/test_mt_accept.rb
@@ -14,7 +14,6 @@ class TestMtAccept < Testcase
     skip "Linux kernel required" unless RUBY_PLATFORM =~ /linux/
     skip "/proc not mounted" unless File.directory?("/proc")
     err, cfg, host, port = @err, Yahns::Config.new, @srv.addr[3], @srv.addr[1]
-    opts = { threads: 1 }
     cfg.instance_eval do
       GTL.synchronize do
         app(:rack, Rack::Lobster.new) { listen "#{host}:#{port}", threads: 1 }
@@ -29,7 +28,6 @@ class TestMtAccept < Testcase
     quit_wait(pid)
 
     cfg = Yahns::Config.new
-    opts = { threads: 1 }
     cfg.instance_eval do
       GTL.synchronize do
         app(:rack, Rack::Lobster.new) { listen "#{host}:#{port}", threads: 2 }