Skip to content

Commit 490e51d

Browse files
authored
Merge pull request #20970 from Homebrew/dug-restore-fixed-cop
Restore Style/RedundantLineContinuation following upstream fix
2 parents 6b12af3 + b0e2059 commit 490e51d

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

Library/.rubocop.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -437,11 +437,6 @@ Style/OptionalBooleanParameter:
437437
- respond_to?
438438
- respond_to_missing?
439439

440-
# Broken in RuboCop 1.68.0 so tries to fix line continuations in inline patch blocks:
441-
# https://github.com/Homebrew/brew/actions/runs/11653110391/job/32460881827?pr=18682
442-
Style/RedundantLineContinuation:
443-
Enabled: false
444-
445440
# Rescuing `StandardError` is an understood default.
446441
Style/RescueStandardError:
447442
EnforcedStyle: implicit

Library/Homebrew/bundle/brewfile.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def self.path(dash_writes_to_stdout: false, global: false, file: nil)
2929
end
3030
user_config_home_brewfile = "#{user_config_home}/Brewfile"
3131

32-
if user_config_home.present? && Dir.exist?(user_config_home) && \
32+
if user_config_home.present? && Dir.exist?(user_config_home) &&
3333
(File.exist?(user_config_home_brewfile) || !File.exist?(home_brewfile))
3434
user_config_home_brewfile
3535
else

Library/Homebrew/cask/upgrade.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ def self.upgrade_casks!(
9090
)
9191
quarantine = true if quarantine.nil?
9292

93-
outdated_casks = \
93+
outdated_casks =
9494
self.outdated_casks(casks, args:, greedy:, greedy_latest:, greedy_auto_updates:, force:, quiet:)
9595

9696
manual_installer_casks = outdated_casks.select do |cask|

Library/Homebrew/dev-cmd/contributions.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ def scan_repositories(organisation, repositories, person, from:, to:)
216216
verbose = args.verbose?
217217

218218
puts "Querying pull requests for #{person} in #{organisation}..." if args.verbose?
219-
organisation_merged_prs = \
219+
organisation_merged_prs =
220220
GitHub.search_merged_pull_requests_in_user_or_organisation(organisation, person, from:, to:)
221-
organisation_approved_reviews = \
221+
organisation_approved_reviews =
222222
GitHub.search_approved_pull_requests_in_user_or_organisation(organisation, person, from:, to:)
223223

224224
require "utils/git"

0 commit comments

Comments
 (0)