Lint/UselessAssignment

Author: tamird

.rubocop_todo.yml

@@ -9,10 +9,6 @@
 Lint/UselessAccessModifier:
   Enabled: false
 
-# Offense count: 10
-Lint/UselessAssignment:
-  Enabled: false
-
 # Offense count: 1
 Lint/Void:
   Enabled: false

benchmark/query_with_mysql_casting.rb

@@ -38,12 +38,14 @@ def mysql_cast(type, value)
   end
 end
 
+debug = ENV['DEBUG']
+
 Benchmark.ips do |x|
   mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
   mysql2.query "USE #{database}"
   x.report "Mysql2" do
     mysql2_result = mysql2.query sql, :symbolize_keys => true
-    # mysql2_result.each { |res| puts res.inspect }
+    mysql2_result.each { |res| puts res.inspect } if debug
   end
 
   mysql = Mysql.new("localhost", "root")
@@ -55,15 +57,15 @@ def mysql_cast(type, value)
       row_hash = row.each_with_index.each_with_object({}) do |(f, j), hash|
         hash[fields[j].name.to_sym] = mysql_cast(fields[j].type, f)
       end
-      # puts row_hash.inspect
+      puts row_hash.inspect if debug
     end
   end
 
   do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
   command = do_mysql.create_command sql
   x.report "do_mysql" do
     do_result = command.execute_reader
-    # do_result.each { |res| puts res.inspect }
+    do_result.each { |res| puts res.inspect } if debug
   end
 
   x.compare!

benchmark/query_without_mysql_casting.rb

@@ -10,31 +10,33 @@
 database = 'test'
 sql = "SELECT * FROM mysql2_test LIMIT 100"
 
+debug = ENV['DEBUG']
+
 Benchmark.ips do |x|
   mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
   mysql2.query "USE #{database}"
   x.report "Mysql2 (cast: true)" do
     mysql2_result = mysql2.query sql, :symbolize_keys => true, :cast => true
-    # mysql2_result.each { |res| puts res.inspect }
+    mysql2_result.each { |res| puts res.inspect } if debug
   end
 
   x.report "Mysql2 (cast: false)" do
     mysql2_result = mysql2.query sql, :symbolize_keys => true, :cast => false
-    # mysql2_result.each { |res| puts res.inspect }
+    mysql2_result.each { |res| puts res.inspect } if debug
   end
 
   mysql = Mysql.new("localhost", "root")
   mysql.query "USE #{database}"
   x.report "Mysql" do
     mysql_result = mysql.query sql
-    # mysql_result.each_hash { |res| puts res.inspect }
+    mysql_result.each_hash { |res| puts res.inspect } if debug
   end
 
   do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
   command = DataObjects::Mysql::Command.new do_mysql, sql
   x.report "do_mysql" do
     do_result = command.execute_reader
-    # do_result.each { |res| puts res.inspect }
+    do_result.each { |res| puts res.inspect } if debug
   end
 
   x.compare!

ext/mysql2/extconf.rb

@@ -42,6 +42,7 @@ def asplode(lib)
 # If the user has provided a --with-mysql-dir argument, we must respect it or fail.
 inc, lib = dir_config('mysql')
 if inc && lib
+  # TODO: Remove when 2.0.0 is the minimum supported version
   # Ruby versions not incorporating the mkmf fix at
   # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
   # do not properly search for lib directories, and must be corrected
@@ -73,11 +74,11 @@ def asplode(lib)
   $libs = libs + " " + $libs
   rpath_dir = libs
 else
-  inc, lib = dir_config('mysql', '/usr/local')
+  _, usr_local_lib = dir_config('mysql', '/usr/local')
 
-  asplode("mysql client") unless find_library('mysqlclient', 'mysql_query', lib, "#{lib}/mysql")
+  asplode("mysql client") unless find_library('mysqlclient', 'mysql_query', usr_local_lib, "#{usr_local_lib}/mysql")
 
-  rpath_dir = lib
+  rpath_dir = usr_local_lib
 end
 
 if have_header('mysql.h')
@@ -90,7 +91,7 @@ def asplode(lib)
 
 %w(errmsg.h mysqld_error.h).each do |h|
   header = [prefix, h].compact.join '/'
-  asplode h unless have_header h
+  asplode h unless have_header header
 end
 
 # This is our wishlist. We use whichever flags work on the host.

tasks/compile.rake

@@ -71,7 +71,7 @@ end
 task :devkit do
   begin
     require "devkit"
-  rescue LoadError => e
+  rescue LoadError
     abort "Failed to activate RubyInstaller's DevKit required for compilation."
   end
 end