Apply Rubocop Performance/BlockGivenWithExplicitBlock (mastodon#23441)

* Apply Rubocop Performance/BlockGivenWithExplicitBlock * Unprefix used block parameter
quadrismegistus · Feb 8, 2023 · 0d1f192 · 0d1f192
1 parent 26ac244
commit 0d1f192
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -67,15 +67,15 @@ def omniauth_only?
   def link_to_login(name = nil, html_options = nil, &block)
     target = new_user_session_path
 
-    html_options = name if block_given?
+    html_options = name if block
 
     if omniauth_only? && Devise.mappings[:user].omniauthable? && User.omniauth_providers.size == 1
       target = omniauth_authorize_path(:user, User.omniauth_providers[0])
       html_options ||= {}
       html_options[:method] = :post
     end
 
-    if block_given?
+    if block
       link_to(target, html_options, &block)
     else
       link_to(name, target, html_options)

diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb
@@ -213,7 +213,7 @@ def build_request(uri, on_behalf_of = nil)
     end
   end
 
-  def load_jsonld_context(url, _options = {}, &_block)
+  def load_jsonld_context(url, _options = {}, &block)
     json = Rails.cache.fetch("jsonld:context:#{url}", expires_in: 30.days, raw: true) do
       request = Request.new(:get, url)
       request.add_headers('Accept' => 'application/ld+json')
@@ -226,6 +226,6 @@ def load_jsonld_context(url, _options = {}, &_block)
 
     doc = JSON::LD::API::RemoteDocument.new(json, documentUrl: url)
 
-    block_given? ? yield(doc) : doc
+    block ? yield(doc) : doc
   end
 end
diff --git a/app/lib/extractor.rb b/app/lib/extractor.rb
@@ -18,7 +18,7 @@ def extract_entities_with_indices(text, options = {}, &block)
     return [] if entities.empty?
 
     entities = remove_overlapping_entities(entities)
-    entities.each(&block) if block_given?
+    entities.each(&block) if block
     entities
   end
 

diff --git a/app/models/trends/history.rb b/app/models/trends/history.rb
@@ -87,7 +87,7 @@ def aggregate(date_range)
   end
 
   def each(&block)
-    if block_given?
+    if block
       (0...7).map { |i| yield(get(i.days.ago)) }
     else
       to_enum(:each)