From b1eaf8bbd2e4e2cc9b9c723580e00dca1918d3a2 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 1 Mar 2023 00:02:22 +0000
Subject: [PATCH 1/2] rubocop: Move `Style/DocumentationMethod` into the other
 file

---
 Library/.rubocop.yml          | 4 ----
 Library/Homebrew/.rubocop.yml | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 78dd2c2e7431f..6bf5aa9c81e92 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -367,10 +367,6 @@ Style/Documentation:
     - "**/{Formula,Casks}/**/*.rb"
     - "**/*.rbi"
 
-Style/DocumentationMethod:
-  Include:
-    - "Homebrew/formula.rb"
-
 # This is quite a large change, so don't enforce this yet for formulae.
 # We should consider doing so in the future, but be aware of the impact on third-party taps.
 Style/FetchEnvVar:
diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
index b0c21afab7ca4..cf9bf49b690f8 100644
--- a/Library/Homebrew/.rubocop.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -60,6 +60,10 @@ Style/Documentation:
     - utils/string_inreplace_extension.rb
     - version.rb
 
+Style/DocumentationMethod:
+  Include:
+    - "formula.rb"
+
 Style/HashAsLastArrayItem:
   Exclude:
     - "test/utils/spdx_spec.rb"

From d16b241f4c0dcb0a531003e5a50f4b1d26355198 Mon Sep 17 00:00:00 2001
From: Issy Long <me@issyl0.co.uk>
Date: Wed, 1 Mar 2023 00:02:30 +0000
Subject: [PATCH 2/2] rubocop: Consolidate `Style/BlockDelimiters` config into
 one file

---
 Library/.rubocop.yml          | 2 ++
 Library/Homebrew/.rubocop.yml | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml
index 6bf5aa9c81e92..4b579cd488f9c 100644
--- a/Library/.rubocop.yml
+++ b/Library/.rubocop.yml
@@ -338,6 +338,8 @@ Style/BarePercentLiterals:
 
 # make rspec formatting more flexible
 Style/BlockDelimiters:
+  BracesRequiredMethods:
+    - "sig"
   Exclude:
     - "Homebrew/**/*_spec.rb"
     - "Homebrew/**/shared_examples/**/*.rb"
diff --git a/Library/Homebrew/.rubocop.yml b/Library/Homebrew/.rubocop.yml
index cf9bf49b690f8..3015754abcc64 100644
--- a/Library/Homebrew/.rubocop.yml
+++ b/Library/Homebrew/.rubocop.yml
@@ -68,9 +68,5 @@ Style/HashAsLastArrayItem:
   Exclude:
     - "test/utils/spdx_spec.rb"
 
-Style/BlockDelimiters:
-  BracesRequiredMethods:
-    - "sig"
-
 Bundler/GemFilename:
   Enabled: false