From 74d3ba702963f0beed036e5c9c12ac14a67bcc3e Mon Sep 17 00:00:00 2001
From: Li Zhijian <zhijianx.li@intel.com>
Date: Tue, 31 Oct 2017 10:25:53 +0800
Subject: [PATCH] cleanup rubocop issue Style/FormatString

1. use auto-correct
2. manully check whether one "%" has "data"
-----------------
2017-10-11 23:15:20.029795500 ERROR [lkp perf-bisect 7542]
/lkp/lkp/.src-20171011-222056/lib/plot.rb:213:in `format': can't convert Array into Integer (TypeError),
rescued at "/lkp/lkp/.src-20171011-222056/tools/plot-bisect-heads:124:in `rescue in
block in <main>'", dumped at /bbuild-tests/failed-cmd/inn-plot-bisect-heads-TypeError-20171011231520021362
-----------------

Signed-off-by: Li Zhijian <zhijianx.li@intel.com>
Signed-off-by: Philip Li <philip.li@intel.com>
---
 lib/common.rb |  2 +-
 lib/plot.rb   |  8 ++++----
 lib/stats.rb  |  4 ++--
 sbin/compare  | 24 ++++++++++++------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/common.rb b/lib/common.rb
index 0d50fbcdd..a07db0ab2 100755
--- a/lib/common.rb
+++ b/lib/common.rb
@@ -121,7 +121,7 @@ def format_number(number)
       else
         '%.4g'
       end
-    s = fmt % [number]
+    s = format(fmt, number)
     # Remove trailing 0
     if fmt[-1] == 'f'
       s.gsub(/\.?0+$/, '')
diff --git a/lib/plot.rb b/lib/plot.rb
index c570d682a..1a8eaae46 100755
--- a/lib/plot.rb
+++ b/lib/plot.rb
@@ -95,15 +95,15 @@ def setup_output(plot, file_name)
     if file_name
       case file_name
       when /eps/
-        plot.terminal 'eps size %d,%d fontscale 1' % @inch_size
+        plot.terminal format('eps size %d,%d fontscale 1', @inch_size[0], @inch_size[1])
         file_name += '.eps' unless file_name.end_with? '.eps'
       else
-        plot.terminal 'png size %d,%d' % @pixel_size
+        plot.terminal format('png size %d,%d', @pixel_size[0], @pixel_size[1])
         file_name += '.png' unless file_name.end_with? '.png'
       end
       plot.output file_name
     else
-      plot.terminal 'dumb nofeed size %d,%d' % @char_size
+      plot.terminal format('dumb nofeed size %d,%d', @char_size[0], @char_size[1])
     end
   end
 end
@@ -210,7 +210,7 @@ def plot
             setup_output p, file
           else
             if (np % @nr_plot).zero?
-              p.terminal 'dumb nofeed size %d,%d' % @char_size
+              p.terminal format('dumb nofeed size %d,%d', @char_size[0], @char_size[1])
               p.multiplot "layout 1,#{@nr_plot}"
             end
             np += 1
diff --git a/lib/stats.rb b/lib/stats.rb
index c1b082692..37c612bfd 100755
--- a/lib/stats.rb
+++ b/lib/stats.rb
@@ -508,8 +508,8 @@ def __get_changed_stats(a, b, is_incomplete_run, options)
       next unless is_reasonable_perf_change(k, delta, max)
     end
 
-    interval_a = '[ %-10.5g - %-10.5g ]' % [min_a, max_a]
-    interval_b = '[ %-10.5g - %-10.5g ]' % [min_b, max_b]
+    interval_a = format('[ %-10.5g - %-10.5g ]', min_a, max_a)
+    interval_b = format('[ %-10.5g - %-10.5g ]', min_b, max_b)
     interval = interval_a + ' -- ' + interval_b
 
     changed_stats[k] = { 'stat' => k,
diff --git a/sbin/compare b/sbin/compare
index 614e089fa..f69d634a6 100755
--- a/sbin/compare
+++ b/sbin/compare
@@ -506,15 +506,15 @@ def show_one_diff(stat, dim, v0, v, v0_stddev, v_stddev, is_float, is_exp, is_fa
           0
         end
     buf = if is_fail
-            sprintf "%#{REL_WIDTH - 2}.0f%% ", p
+            format "%#{REL_WIDTH - 2}.0f%% ", p
           elsif stat =~ ABS_CHANGE_STATS_RE
-            sprintf "%#{REL_WIDTH - 1}.0g ", v - v0
+            format "%#{REL_WIDTH - 1}.0g ", v - v0
           elsif p.abs < 3
             sprintf ' ' * REL_WIDTH
           elsif p.abs < 100_000
-            sprintf "%#{REL_WIDTH - 2}.0f%% ", p
+            format "%#{REL_WIDTH - 2}.0f%% ", p
           else
-            sprintf "%#{REL_WIDTH - 2}.0g%% ", p
+            format "%#{REL_WIDTH - 2}.0g%% ", p
           end
 
     buf = Term::ANSIColor.intense_red(buf) if p.abs >= 50 && $colorful
@@ -522,29 +522,29 @@ def show_one_diff(stat, dim, v0, v, v0_stddev, v_stddev, is_float, is_exp, is_fa
 
   buf += if is_exp
            if is_float == false && v.abs < 100_000_000
-             sprintf "%#{ABS_WIDTH}d", v
+             format "%#{ABS_WIDTH}d", v
            else
-             sprintf "%#{ABS_WIDTH}.4g", v
+             format "%#{ABS_WIDTH}.4g", v
            end
          elsif is_float
-           sprintf "%#{ABS_WIDTH}.2f", v
+           format "%#{ABS_WIDTH}.2f", v
          elsif is_fail
            if v.zero?
-             sprintf "%#{ABS_WIDTH + 1}s", ' '
+             format "%#{ABS_WIDTH + 1}s", ' '
            else
-             sprintf "%#{ABS_WIDTH + 1}d", v
+             format "%#{ABS_WIDTH + 1}d", v
            end
          else
-           sprintf "%#{ABS_WIDTH}d", v
+           format "%#{ABS_WIDTH}d", v
          end
 
   if v_stddev
     if is_fail
-      buf += sprintf ":%-#{ERR_WIDTH - 2}d", v_stddev
+      buf += format ":%-#{ERR_WIDTH - 2}d", v_stddev
     else
       v_stddev = 100 * v_stddev / v if v != 0
       buf += if v_stddev > 3
-               sprintf " ±%#{ERR_WIDTH - 3}d%%", v_stddev
+               format " ±%#{ERR_WIDTH - 3}d%%", v_stddev
              else
                ' ' * ERR_WIDTH
              end