diff options
37 files changed, 62 insertions, 73 deletions
@@ -1,3 +1,10 @@ +Tue Nov 9 05:54:57 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/*.rb: Remove unused variable warnings. + Patch by Run Paint [ruby-core:30991] + + * lib/rubygems/*, lib/rdoc/*.rb, lib/rake/*.rb: ditto + Mon Nov 8 18:26:03 2010 NARUSE, Yui <naruse@ruby-lang.org> * util.c (ruby_hdtoa): fix type cast and bufsize. diff --git a/lib/benchmark.rb b/lib/benchmark.rb index 8e7f778e2d..d251fc7e88 100644 --- a/lib/benchmark.rb +++ b/lib/benchmark.rb @@ -558,16 +558,16 @@ if __FILE__ == $0 n = ARGV[0].to_i.nonzero? || 50000 puts %Q([#{n} times iterations of `a = "1"']) benchmark(" " + CAPTION, 7, FMTSTR) do |x| - x.report("for:") {for i in 1..n; a = "1"; end} # Benchmark::measure - x.report("times:") {n.times do ; a = "1"; end} - x.report("upto:") {1.upto(n) do ; a = "1"; end} + x.report("for:") {for _ in 1..n; _ = "1"; end} # Benchmark::measure + x.report("times:") {n.times do ; _ = "1"; end} + x.report("upto:") {1.upto(n) do ; _ = "1"; end} end benchmark do [ - measure{for i in 1..n; a = "1"; end}, # Benchmark::measure - measure{n.times do ; a = "1"; end}, - measure{1.upto(n) do ; a = "1"; end} + measure{for _ in 1..n; _ = "1"; end}, # Benchmark::measure + measure{n.times do ; _ = "1"; end}, + measure{1.upto(n) do ; _ = "1"; end} ] end end diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb index 08f97f4bc6..2abed5dce7 100644 --- a/lib/drb/ssl.rb +++ b/lib/drb/ssl.rb @@ -122,7 +122,7 @@ module DRb end def self.open(uri, config) - host, port, option = parse_uri(uri) + host, port, = parse_uri(uri) host.untaint port.untaint soc = TCPSocket.open(host, port) @@ -134,7 +134,7 @@ module DRb def self.open_server(uri, config) uri = 'drbssl://:0' unless uri - host, port, opt = parse_uri(uri) + host, port, = parse_uri(uri) if host.size == 0 host = getservername soc = open_server_inaddr_any(host, port) diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb index 6d8935b1ef..7a4a097ba8 100644 --- a/lib/drb/timeridconv.rb +++ b/lib/drb/timeridconv.rb @@ -64,7 +64,7 @@ module DRb def keeper Thread.new do loop do - size = alternate + alternate sleep(@timeout) end end diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb index ebecc22901..a377dd995e 100644 --- a/lib/drb/unix.rb +++ b/lib/drb/unix.rb @@ -19,14 +19,14 @@ module DRb end def self.open(uri, config) - filename, option = parse_uri(uri) + filename, = parse_uri(uri) filename.untaint soc = UNIXSocket.open(filename) self.new(uri, soc, config) end def self.open_server(uri, config) - filename, option = parse_uri(uri) + filename, = parse_uri(uri) if filename.size == 0 soc = temp_server filename = soc.path diff --git a/lib/irb/ext/multi-irb.rb b/lib/irb/ext/multi-irb.rb index 0152d38ffd..a8475b75cd 100644 --- a/lib/irb/ext/multi-irb.rb +++ b/lib/irb/ext/multi-irb.rb @@ -29,12 +29,12 @@ module IRB end def thread(key) - th, irb = search(key) + th, = search(key) th end def irb(key) - th, irb = search(key) + _, irb = search(key) irb end @@ -62,7 +62,7 @@ module IRB def kill(*keys) for key in keys - th, irb = search(key) + th, _ = search(key) IRB.fail IrbAlreadyDead unless th.alive? th.exit end diff --git a/lib/irb/ws-for-case-2.rb b/lib/irb/ws-for-case-2.rb index bb3932ad62..9f3af49f30 100644 --- a/lib/irb/ws-for-case-2.rb +++ b/lib/irb/ws-for-case-2.rb @@ -10,5 +10,5 @@ # while true - IRB::BINDING_QUEUE.push b = binding + IRB::BINDING_QUEUE.push _ = binding end diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb index f393a15bff..4ed2517018 100644 --- a/lib/net/ftp.rb +++ b/lib/net/ftp.rb @@ -322,7 +322,7 @@ module Net sock = TCPServer.open(@sock.addr[3], 0) port = sock.addr[1] host = sock.addr[3] - resp = sendport(host, port) + sendport(host, port) return sock end private :makeport diff --git a/lib/net/http.rb b/lib/net/http.rb index 20c9bb7c92..33c88c8ce5 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1563,7 +1563,7 @@ module Net #:nodoc: # or sub-type is not given (e.g. "Content-Type: text"). def sub_type return nil unless @header['content-type'] - main, sub = *self['Content-Type'].split(';').first.to_s.split('/') + _, sub = *self['Content-Type'].split(';').first.to_s.split('/') return nil unless sub sub.strip end diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 9de6395236..c3dda46606 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -2680,7 +2680,6 @@ module Net token = match(T_ATOM) name = token.value.upcase match(T_SPACE) - mailbox = astring data = [] token = lookahead if token.symbol == T_SPACE diff --git a/lib/racc/parser.rb b/lib/racc/parser.rb index 9b7a76bc58..887fa8c553 100644 --- a/lib/racc/parser.rb +++ b/lib/racc/parser.rb @@ -105,13 +105,12 @@ module Racc def _racc_do_parse_rb(arg, in_debug) action_table, action_check, action_default, action_pointer, - goto_table, goto_check, goto_default, goto_pointer, - nt_base, reduce_table, token_table, shift_n, - reduce_n, use_result, * = arg + _, _, _, _, + _, _, token_table, _, + _, _, * = arg _racc_init_sysvars tok = act = i = nil - nerr = 0 catch(:racc_end_parse) { while true @@ -154,14 +153,13 @@ module Racc def _racc_yyparse_rb(recv, mid, arg, c_debug) action_table, action_check, action_default, action_pointer, - goto_table, goto_check, goto_default, goto_pointer, - nt_base, reduce_table, token_table, shift_n, - reduce_n, use_result, * = arg + _, _, _, _, + _, _, token_table, _, + _, _, * = arg _racc_init_sysvars act = nil i = nil - nerr = 0 catch(:racc_end_parse) { until i = action_pointer[@racc_state[-1]] @@ -210,10 +208,10 @@ module Racc ### def _racc_evalact(act, arg) - action_table, action_check, action_default, action_pointer, - goto_table, goto_check, goto_default, goto_pointer, - nt_base, reduce_table, token_table, shift_n, - reduce_n, use_result, * = arg + action_table, action_check, _, action_pointer, + _, _, _, _, + _, _, _, shift_n, reduce_n, + _, _, * = arg nerr = 0 # tmp if act > 0 and act < shift_n @@ -305,10 +303,10 @@ module Racc end def _racc_do_reduce(arg, act) - action_table, action_check, action_default, action_pointer, + _, _, _, _, goto_table, goto_check, goto_default, goto_pointer, - nt_base, reduce_table, token_table, shift_n, - reduce_n, use_result, * = arg + nt_base, reduce_table, _, _, + _, use_result, * = arg state = @racc_state vstack = @racc_vstack tstack = @racc_tstack diff --git a/lib/rexml/attribute.rb b/lib/rexml/attribute.rb index 28a5923608..e99927943f 100644 --- a/lib/rexml/attribute.rb +++ b/lib/rexml/attribute.rb @@ -115,7 +115,7 @@ module REXML def doctype if @element doc = @element.document - doctype = doc.doctype if doc + doc.doctype if doc end end diff --git a/lib/rexml/child.rb b/lib/rexml/child.rb index fd59d7283a..de84a312fe 100644 --- a/lib/rexml/child.rb +++ b/lib/rexml/child.rb @@ -88,7 +88,7 @@ module REXML # This doesn't yet handle encodings def bytes - encoding = document.encoding + document.encoding to_s end diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb index 1a946a1587..678095ae28 100644 --- a/lib/rexml/doctype.rb +++ b/lib/rexml/doctype.rb @@ -115,7 +115,6 @@ module REXML output << " #{@long_name.inspect}" if @long_name output << " #{@uri.inspect}" if @uri unless @children.empty? - next_indent = indent + 1 output << ' [' @children.each { |child| output << "\n" diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb index f999b0b2b1..97fbd0645b 100644 --- a/lib/rexml/element.rb +++ b/lib/rexml/element.rb @@ -874,7 +874,6 @@ module REXML # a.elements.add(Element.new('b')) #-> <a><b/></a> # a.elements.add('c') #-> <a><b/><c/></a> def add element=nil - rv = nil if element.nil? Element.new("", self, @element.context) elsif not element.kind_of?(Element) @@ -1092,7 +1091,7 @@ module REXML delete attr return end - element_document = @element.document + unless value.kind_of? Attribute if @element.document and @element.document.doctype value = Text::normalize( value, @element.document.doctype ) @@ -1197,7 +1196,7 @@ module REXML return @element else # the supplied attribute is a top-level one attr = old - res = super(name) + super(name) end @element end diff --git a/lib/rexml/formatters/transitive.rb b/lib/rexml/formatters/transitive.rb index 3a52e03f01..6cc690d922 100644 --- a/lib/rexml/formatters/transitive.rb +++ b/lib/rexml/formatters/transitive.rb @@ -37,7 +37,6 @@ module REXML # If compact and all children are text, and if the formatted output # is less than the specified width, then try to print everything on # one line - skip = false @level += @indentation node.children.each { |child| write( child, output ) diff --git a/lib/rexml/functions.rb b/lib/rexml/functions.rb index 2d30e5fe92..7a05d0cf9f 100644 --- a/lib/rexml/functions.rb +++ b/lib/rexml/functions.rb @@ -170,7 +170,6 @@ module REXML # Kouhei fixed this too def Functions::substring_after( string, test ) ruby_string = string(string) - test_string = string(test) return $1 if ruby_string =~ /#{test}(.*)/ "" end diff --git a/lib/rexml/parsers/sax2parser.rb b/lib/rexml/parsers/sax2parser.rb index d0f0c5155e..1e69e14e45 100644 --- a/lib/rexml/parsers/sax2parser.rb +++ b/lib/rexml/parsers/sax2parser.rb @@ -87,7 +87,7 @@ module REXML @listeners.each { |sym,match,block| block.start_document if sym == :start_document or sym.nil? } - root = context = [] + context = [] while true event = @parser.pull case event[0] diff --git a/lib/rexml/parsers/xpathparser.rb b/lib/rexml/parsers/xpathparser.rb index 2db37a2578..780e312671 100644 --- a/lib/rexml/parsers/xpathparser.rb +++ b/lib/rexml/parsers/xpathparser.rb @@ -282,7 +282,6 @@ module REXML PI = /^processing-instruction\(/ def NodeTest path, parsed #puts "NodeTest with #{path}" - res = nil case path when /^\*/ path = $' @@ -578,7 +577,6 @@ module REXML NUMBER = /^(\d*\.?\d+)/ NT = /^comment|text|processing-instruction|node$/ def PrimaryExpr path, parsed - arry = [] case path when VARIABLE_REFERENCE varname = $1 diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb index 3ad8023470..06cb4f9115 100644 --- a/lib/rexml/quickpath.rb +++ b/lib/rexml/quickpath.rb @@ -33,7 +33,6 @@ module REXML results = filter(element.to_a, path) when /^[\[!\w:]/u # match on child - matches = [] children = element.to_a results = filter(children, path) else @@ -51,8 +50,6 @@ module REXML when /^\/\//u # Descendant return axe( elements, "descendant-or-self", $' ) when /^\/?\b(\w[-\w]*)\b::/u # Axe - axe_name = $1 - rest = $' return axe( elements, $1, $' ) when /^\/(?=\b([:!\w][-\.\w]*:)?[-!\*\.\w]*\b([^:(]|$)|\*)/u # Child rest = $' diff --git a/lib/rexml/validation/validation.rb b/lib/rexml/validation/validation.rb index f0ffa78912..8042e5d062 100644 --- a/lib/rexml/validation/validation.rb +++ b/lib/rexml/validation/validation.rb @@ -33,7 +33,7 @@ module REXML sattr = [:start_attribute, nil] eattr = [:end_attribute] text = [:text, nil] - k,v = event[2].find { |key,value| + k, = event[2].find { |key,value| sattr[1] = key #puts "Looking for #{sattr.inspect}" m = @current.next( sattr ) diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb index d9088a25d9..3bffd389d0 100644 --- a/lib/rexml/xpath_parser.rb +++ b/lib/rexml/xpath_parser.rb @@ -687,7 +687,7 @@ module REXML return rv else res = [] - enum = SyncEnumerator.new( set1, set2 ).each { |i1, i2| + SyncEnumerator.new( set1, set2 ).each { |i1, i2| #puts "i1 = #{i1.inspect} (#{i1.class.name})" #puts "i2 = #{i2.inspect} (#{i2.class.name})" i1 = norm( i1 ) diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb index b25fd99856..3b59b43aaf 100644 --- a/lib/rinda/ring.rb +++ b/lib/rinda/ring.rb @@ -198,7 +198,7 @@ module Rinda def lookup_ring_any(timeout=5) queue = Queue.new - th = Thread.new do + Thread.new do self.lookup_ring(timeout) do |ts| queue.push(ts) end @@ -252,7 +252,7 @@ if __FILE__ == $0 when 's' require 'rinda/tuplespace' ts = Rinda::TupleSpace.new - place = Rinda::RingServer.new(ts) + Rinda::RingServer.new(ts) $stdin.gets when 'w' finger = Rinda::RingFinger.new(nil) diff --git a/lib/rss/atom.rb b/lib/rss/atom.rb index ff8ff2249a..7720f77539 100644 --- a/lib/rss/atom.rb +++ b/lib/rss/atom.rb @@ -527,7 +527,7 @@ module RSS return false unless inline_other? return false if inline_other_xml? - media_type, subtype = mime_split + media_type, = mime_split return true if "text" == media_type.downcase false end diff --git a/lib/rss/maker/0.9.rb b/lib/rss/maker/0.9.rb index aede4d7c20..c398343ec4 100644 --- a/lib/rss/maker/0.9.rb +++ b/lib/rss/maker/0.9.rb @@ -24,7 +24,7 @@ module RSS class Channel < ChannelBase def to_feed(rss) channel = Rss::Channel.new - set = setup_values(channel) + setup_values(channel) _not_set_required_variables = not_set_required_variables if _not_set_required_variables.empty? rss.channel = channel @@ -257,7 +257,7 @@ module RSS class Item < ItemBase def to_feed(rss) item = Rss::Channel::Item.new - set = setup_values(item) + setup_values(item) _not_set_required_variables = not_set_required_variables if _not_set_required_variables.empty? rss.items << item diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb index 0d8075f836..1b9f7c3b79 100644 --- a/lib/rss/maker/1.0.rb +++ b/lib/rss/maker/1.0.rb @@ -32,7 +32,7 @@ module RSS _not_set_required_variables = not_set_required_variables if _not_set_required_variables.empty? channel = RDF::Channel.new(@about) - set = setup_values(channel) + setup_values(channel) channel.dc_dates.clear rss.channel = channel set_parent(channel, rss) diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb index 9069c27d06..717b074fae 100644 --- a/lib/rss/maker/dublincore.rb +++ b/lib/rss/maker/dublincore.rb @@ -11,10 +11,7 @@ module RSS plural_name ||= "#{name}s" full_name = "#{RSS::DC_PREFIX}_#{name}" full_plural_name = "#{RSS::DC_PREFIX}_#{plural_name}" - klass_name = Utils.to_class_name(name) plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}" - full_plural_klass_name = "self.class::#{plural_klass_name}" - full_klass_name = "#{full_plural_klass_name}::#{klass_name}" klass.def_classed_elements(full_name, "value", plural_klass_name, full_plural_name, name) klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1) diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index 6f008049ca..28d8cce30d 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -1093,9 +1093,8 @@ EOC tags = tags.sort_by {|x| element_names.index(x) || tags_size} end - _tags = tags.dup if tags models.each_with_index do |model, i| - name, model_uri, occurs, getter = model + name, _, occurs, = model if DEBUG p "before" diff --git a/lib/shell/system-command.rb b/lib/shell/system-command.rb index af9b0a8e37..ee3490efcd 100644 --- a/lib/shell/system-command.rb +++ b/lib/shell/system-command.rb @@ -84,7 +84,7 @@ class Shell notify "Job(%id) start imp-pipe.", @shell.debug? rs = @shell.record_separator unless rs _eop = true - th = Thread.start { + Thread.start { begin while l = @pipe_in.gets @input_queue.push l @@ -109,7 +109,7 @@ class Shell def start_export notify "job(%id) start exp-pipe.", @shell.debug? _eop = true - th = Thread.start{ + Thread.start{ begin @input.each do |l| ProcessController::block_output_synchronize do diff --git a/lib/sync.rb b/lib/sync.rb index b97d36eb43..1477895bbc 100644 --- a/lib/sync.rb +++ b/lib/sync.rb @@ -128,9 +128,8 @@ module Sync_m def sync_try_lock(mode = EX) return unlock if mode == UN @sync_mutex.synchronize do - ret = sync_try_lock_sub(mode) + sync_try_lock_sub(mode) end - ret end def sync_lock(m = EX) diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb index 7099d14689..806d050bc9 100644 --- a/lib/webrick/cgi.rb +++ b/lib/webrick/cgi.rb @@ -143,7 +143,7 @@ module WEBrick setup_header @header_part << CRLF @header_part.rewind - rescue Exception => ex + rescue Exception raise CGIError, "invalid CGI environment" end end diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index 16bf15b6dd..0c292bed2d 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -280,7 +280,7 @@ module WEBrick if @request_method == "HEAD" # do nothing elsif chunked? - remain = body ? @body.bytesize : 0 + body ? @body.bytesize : 0 while buf = @body[@sent_size, @buffer_size] break if buf.empty? data = "" diff --git a/lib/webrick/httpservlet/cgi_runner.rb b/lib/webrick/httpservlet/cgi_runner.rb index dd7325d25c..32ecb6fe00 100644 --- a/lib/webrick/httpservlet/cgi_runner.rb +++ b/lib/webrick/httpservlet/cgi_runner.rb @@ -20,7 +20,6 @@ end STDIN.binmode -buf = "" len = sysread(STDIN, 8).to_i out = sysread(STDIN, len) STDOUT.reopen(open(out, "w")) @@ -38,7 +37,7 @@ hash.each{|k, v| ENV[k] = v if v } dir = File::dirname(ENV["SCRIPT_FILENAME"]) Dir::chdir dir -if interpreter = ARGV[0] +if ARGV[0] argv = ARGV.dup argv << ENV["SCRIPT_FILENAME"] exec(*argv) diff --git a/lib/webrick/httpservlet/erbhandler.rb b/lib/webrick/httpservlet/erbhandler.rb index 845db07169..cbd4fb2303 100644 --- a/lib/webrick/httpservlet/erbhandler.rb +++ b/lib/webrick/httpservlet/erbhandler.rb @@ -44,8 +44,8 @@ module WEBrick private def evaluate(erb, servlet_request, servlet_response) Module.new.module_eval{ - meta_vars = servlet_request.meta_vars - query = servlet_request.query + servlet_request.meta_vars + servlet_request.query erb.result(binding) } end diff --git a/lib/webrick/log.rb b/lib/webrick/log.rb index 0ffa12dd96..550f9f56d6 100644 --- a/lib/webrick/log.rb +++ b/lib/webrick/log.rb @@ -60,7 +60,7 @@ module WEBrick private def format(arg) - str = if arg.is_a?(Exception) + if arg.is_a?(Exception) "#{arg.class}: #{arg.message}\n\t" << arg.backtrace.join("\n\t") << "\n" elsif arg.respond_to?(:to_str) diff --git a/lib/xmlrpc/httpserver.rb b/lib/xmlrpc/httpserver.rb index 66d52139db..a9605efa7a 100644 --- a/lib/xmlrpc/httpserver.rb +++ b/lib/xmlrpc/httpserver.rb @@ -170,7 +170,7 @@ private io << http_resp(response.status, response.status_message, response.header, response.body) - rescue Exception => e + rescue Exception io << http_resp(500, "Internal Server Error") end diff --git a/lib/xmlrpc/parser.rb b/lib/xmlrpc/parser.rb index d8e91b0098..840130ca1e 100644 --- a/lib/xmlrpc/parser.rb +++ b/lib/xmlrpc/parser.rb @@ -714,7 +714,7 @@ module XMLRPC end def parse(str) - parser = REXML::Document.parse_stream(str, self) + REXML::Document.parse_stream(str, self) end end |