From 8ccb013f85cf995b328bd9e641d3d43a813d8941 Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@users.noreply.github.com>
Date: Fri, 15 Mar 2019 22:24:24 +0530
Subject: [PATCH] Use communicative method parameters (#7566)

Merge pull request 7566
---
 .rubocop.yml                         | 3 ---
 lib/jekyll/configuration.rb          | 2 +-
 lib/jekyll/converters/smartypants.rb | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 745a1232..9f090dc4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -92,9 +92,6 @@ Naming/MemoizedInstanceVariableName:
     - lib/jekyll/drops/site_drop.rb
     - lib/jekyll/drops/unified_payload_drop.rb
     - lib/jekyll/page_without_a_file.rb
-Naming/UncommunicativeMethodParamName:
-  AllowedNames:
-    - _
 Security/MarshalLoad:
   Exclude:
     - !ruby/regexp /test\/.*.rb$/
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 61c00017..5cd3e284 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -283,7 +283,7 @@ module Jekyll
       config
     end
 
-    def renamed_key(old, new, config, _ = nil)
+    def renamed_key(old, new, config)
       if config.key?(old)
         Jekyll::Deprecator.deprecation_message "The '#{old}' configuration" \
           " option has been renamed to '#{new}'. Please update your config" \
diff --git a/lib/jekyll/converters/smartypants.rb b/lib/jekyll/converters/smartypants.rb
index 59428dfc..606afdc8 100644
--- a/lib/jekyll/converters/smartypants.rb
+++ b/lib/jekyll/converters/smartypants.rb
@@ -37,7 +37,7 @@ module Jekyll
       # ext - The String extension to check.
       #
       # Returns true if it matches, false otherwise.
-      def matches(_)
+      def matches(_ext)
         false
       end
 
@@ -46,7 +46,7 @@ module Jekyll
       # ext - The String extension or original file.
       #
       # Returns The String output file extension.
-      def output_ext(_)
+      def output_ext(_ext)
         nil
       end