commit ab504e72382d8dc43ca67351b5eec7003fce994c
parent 8441116f67308574aef2339412b426afb151a399
Author: Dan Callaghan <djc@djc.id.au>
Date: Sun, 8 May 2022 09:07:54 +1000
fix "warning: assigned but unused variable"
Diffstat:
15 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/lib/sup/hook.rb b/lib/sup/hook.rb
@@ -138,7 +138,7 @@ private
returning IO.read(fn_for(name)) do
debug "read '#{name}' from #{fn_for(name)}"
end
- rescue SystemCallError => e
+ rescue SystemCallError
#debug "disabled hook for '#{name}': #{e.message}"
nil
end
diff --git a/lib/sup/index.rb b/lib/sup/index.rb
@@ -425,7 +425,7 @@ EOS
## gmail style "is" operator
subs = subs.gsub(/\b(is|has):(\S+)\b/) do
- field, label = $1, $2
+ _field, label = $1, $2
case label
when "read"
"-label:unread"
diff --git a/lib/sup/keymap.rb b/lib/sup/keymap.rb
@@ -98,7 +98,7 @@ EOS
end
def action_for kc
- action, help, keys = @map[kc.code]
+ action, help, _keys = @map[kc.code]
[action, help]
end
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
@@ -105,7 +105,7 @@ class Message
when String
begin
Time.parse date
- rescue ArgumentError => e
+ rescue ArgumentError
#debug "faking mangled date header for #{@id} (orig #{header['date'].inspect} gave error: #{e.message})"
Time.now
end
diff --git a/lib/sup/modes/completion_mode.rb b/lib/sup/modes/completion_mode.rb
@@ -26,7 +26,6 @@ class CompletionMode < ScrollMode
private
def update_lines
- width = buffer.content_width
max_length = @list.max_of { |s| s.length }
num_per = [1, buffer.content_width / (max_length + INTERSTITIAL.length)].max
@lines = [@header].compact
diff --git a/lib/sup/modes/file_browser_mode.rb b/lib/sup/modes/file_browser_mode.rb
@@ -43,7 +43,7 @@ protected
end
def view
- name, f = @files[curpos - RESERVED_ROWS]
+ _name, f = @files[curpos - RESERVED_ROWS]
return unless f && f.file?
begin
@@ -54,7 +54,7 @@ protected
end
def select_file_or_follow_directory
- name, f = @files[curpos - RESERVED_ROWS]
+ _name, f = @files[curpos - RESERVED_ROWS]
return unless f
if f.directory? && f.to_s != "."
diff --git a/lib/sup/modes/label_list_mode.rb b/lib/sup/modes/label_list_mode.rb
@@ -129,7 +129,7 @@ protected
end
def select_label
- label, num_unread = @labels[curpos]
+ label, _num_unread = @labels[curpos]
return unless label
LabelSearchResultsMode.spawn_nicely label
end
diff --git a/lib/sup/modes/search_list_mode.rb b/lib/sup/modes/search_list_mode.rb
@@ -131,13 +131,13 @@ protected
end
def select_search
- name, num_unread = @searches[curpos]
+ name, _num_unread = @searches[curpos]
return unless name
SearchResultsMode.spawn_from_query SearchManager.search_string_for(name)
end
def delete_selected_search
- name, num_unread = @searches[curpos]
+ name, _num_unread = @searches[curpos]
return unless name
reload if SearchManager.delete name
end
diff --git a/lib/sup/modes/thread_view_mode.rb b/lib/sup/modes/thread_view_mode.rb
@@ -241,7 +241,7 @@ EOS
begin
u = URI.parse($1)
- rescue URI::InvalidURIError => e
+ rescue URI::InvalidURIError
BufferManager.flash("Invalid unsubscribe link")
return
end
@@ -868,7 +868,6 @@ private
(0 ... text.length).each do |i|
@chunk_lines[@text.length + i] = m
@message_lines[@text.length + i] = m
- lw = text[i].flatten.select { |x| x.is_a? String }.map { |x| x.display_length }.sum
end
@text += text
diff --git a/lib/sup/rfc2047.rb b/lib/sup/rfc2047.rb
@@ -28,7 +28,7 @@ module Rfc2047
# converted to the target encoding, it is left in its encoded form.
def Rfc2047.decode_to(target, from)
from = from.gsub(WORDSEQ, '\1')
- out = from.gsub(WORD) do
+ from.gsub(WORD) do
|word|
charset, encoding, text = $1, $2, $3
diff --git a/lib/sup/source.rb b/lib/sup/source.rb
@@ -153,7 +153,7 @@ class Source
next unless Rfc2047.is_encoded? v
header[k] = begin
Rfc2047.decode_to $encoding, v
- rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence => e
+ rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::IllegalSequence
#debug "warning: error decoding RFC 2047 header (#{e.class.name}): #{e.message}"
v
end
diff --git a/lib/sup/textfield.rb b/lib/sup/textfield.rb
@@ -119,7 +119,6 @@ class TextField
Ncurses::Form::REQ_END_FIELD
when Ncurses::KEY_UP, Ncurses::KEY_DOWN
unless !@i || @history.empty?
- value = get_cursed_value
#debug "history before #{@history.inspect}"
@i = @i + (c.is_keycode?(Ncurses::KEY_UP) ? -1 : 1)
@i = 0 if @i < 0
diff --git a/lib/sup/thread.rb b/lib/sup/thread.rb
@@ -407,7 +407,6 @@ class ThreadSet
#puts "adding: #{message.id}, refs #{message.refs.inspect}"
el.message = message
- oldroot = el.root
## link via references:
(message.refs + [el.id]).inject(nil) do |prev, ref_id|
diff --git a/test/test_messages_dir.rb b/test/test_messages_dir.rb
@@ -38,7 +38,6 @@ class TestMessagesDir < ::Minitest::Test
assert_equal("Important", subj)
chunks = sup_message.load_from_source!
- indexable_chunks = sup_message.indexable_chunks
# there should be only one chunk
#assert_equal(1, chunks.length)
@@ -67,7 +66,6 @@ class TestMessagesDir < ::Minitest::Test
assert_equal("Content-Transfer-Encoding:-bug in sup", subj)
chunks = sup_message.load_from_source!
- indexable_chunks = sup_message.indexable_chunks
# there should be only one chunk
#assert_equal(1, chunks.length)
@@ -96,7 +94,6 @@ class TestMessagesDir < ::Minitest::Test
assert_equal("Encoding bug", subj)
chunks = sup_message.load_from_source!
- indexable_chunks = sup_message.indexable_chunks
# there should be only one chunk
#assert_equal(1, chunks.length)
diff --git a/test/unit/util/test_query.rb b/test/unit/util/test_query.rb
@@ -30,7 +30,7 @@ describe Redwood::Util::Query do
else
# xapian 1.2 doesn't handle this bad input, so we do
assert_raises Redwood::Util::Query::QueryDescriptionError do
- desc = Redwood::Util::Query.describe (query)
+ _desc = Redwood::Util::Query.describe (query)
end
end