From d3d25beb358e6f680eab0f2f9cf6d18106494674 Mon Sep 17 00:00:00 2001
From: Douglas Eichelberger <dduugg@gmail.com>
Date: Sun, 6 Oct 2024 09:25:57 -0700
Subject: [PATCH] Use requires_ancestor consistently

---
 Library/Homebrew/attrable.rb                           | 4 ++++
 Library/Homebrew/attrable.rbi                          | 5 -----
 Library/Homebrew/cask/metadata.rb                      | 4 ++++
 Library/Homebrew/cask/metadata.rbi                     | 7 -------
 Library/Homebrew/download_strategy.rb                  | 4 ++++
 Library/Homebrew/download_strategy.rbi                 | 4 ----
 Library/Homebrew/downloadable.rb                       | 1 +
 Library/Homebrew/downloadable.rbi                      | 5 -----
 Library/Homebrew/exceptions.rb                         | 4 ++++
 Library/Homebrew/exceptions.rbi                        | 5 -----
 Library/Homebrew/extend/ENV/shared.rb                  | 3 +++
 Library/Homebrew/extend/ENV/shared.rbi                 | 2 --
 Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb  | 4 ++++
 Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi | 5 -----
 Library/Homebrew/extend/pathname.rb                    | 8 ++++++++
 Library/Homebrew/extend/pathname.rbi                   | 9 ---------
 Library/Homebrew/os/linux/elf.rb                       | 4 ++++
 Library/Homebrew/os/linux/elf.rbi                      | 5 -----
 Library/Homebrew/os/mac/mach.rb                        | 3 +++
 Library/Homebrew/os/mac/mach.rbi                       | 5 -----
 20 files changed, 39 insertions(+), 52 deletions(-)
 delete mode 100644 Library/Homebrew/attrable.rbi
 delete mode 100644 Library/Homebrew/cask/metadata.rbi
 delete mode 100644 Library/Homebrew/downloadable.rbi
 delete mode 100644 Library/Homebrew/exceptions.rbi
 delete mode 100644 Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
 delete mode 100644 Library/Homebrew/extend/pathname.rbi
 delete mode 100644 Library/Homebrew/os/linux/elf.rbi
 delete mode 100644 Library/Homebrew/os/mac/mach.rbi

diff --git a/Library/Homebrew/attrable.rb b/Library/Homebrew/attrable.rb
index b081e7d1fe..8912d7e1ad 100644
--- a/Library/Homebrew/attrable.rb
+++ b/Library/Homebrew/attrable.rb
@@ -2,6 +2,10 @@
 # frozen_string_literal: true
 
 module Attrable
+  extend T::Helpers
+
+  requires_ancestor { Module }
+
   sig { params(attrs: Symbol).void }
   def attr_predicate(*attrs)
     attrs.each do |attr|
diff --git a/Library/Homebrew/attrable.rbi b/Library/Homebrew/attrable.rbi
deleted file mode 100644
index 44a9560126..0000000000
--- a/Library/Homebrew/attrable.rbi
+++ /dev/null
@@ -1,5 +0,0 @@
-# typed: strict
-
-module Attrable
-  requires_ancestor { Module }
-end
diff --git a/Library/Homebrew/cask/metadata.rb b/Library/Homebrew/cask/metadata.rb
index 271845c48b..39ab2d8c5b 100644
--- a/Library/Homebrew/cask/metadata.rb
+++ b/Library/Homebrew/cask/metadata.rb
@@ -4,9 +4,13 @@
 module Cask
   # Helper module for reading and writing cask metadata.
   module Metadata
+    extend T::Helpers
+
     METADATA_SUBDIR = ".metadata"
     TIMESTAMP_FORMAT = "%Y%m%d%H%M%S.%L"
 
+    requires_ancestor { Cask }
+
     def metadata_main_container_path(caskroom_path: self.caskroom_path)
       caskroom_path.join(METADATA_SUBDIR)
     end
diff --git a/Library/Homebrew/cask/metadata.rbi b/Library/Homebrew/cask/metadata.rbi
deleted file mode 100644
index 1b92e9ce74..0000000000
--- a/Library/Homebrew/cask/metadata.rbi
+++ /dev/null
@@ -1,7 +0,0 @@
-# typed: strict
-
-module Cask
-  module Metadata
-    requires_ancestor { Cask }
-  end
-end
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 9f9bb1135f..a8cd27324d 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -31,6 +31,10 @@ class AbstractDownloadStrategy
 
   # Extension for bottle downloads.
   module Pourable
+    extend T::Helpers
+
+    requires_ancestor { AbstractDownloadStrategy }
+
     def stage
       ohai "Pouring #{basename}"
       super
diff --git a/Library/Homebrew/download_strategy.rbi b/Library/Homebrew/download_strategy.rbi
index 0df06cf3b1..b46c901061 100644
--- a/Library/Homebrew/download_strategy.rbi
+++ b/Library/Homebrew/download_strategy.rbi
@@ -1,9 +1,5 @@
 # typed: strict
 
-module AbstractDownloadStrategy::Pourable
-  requires_ancestor { AbstractDownloadStrategy }
-end
-
 # This is a third-party implementation
 # rubocop:disable Lint/StructNewOverride
 class Mechanize::HTTP
diff --git a/Library/Homebrew/downloadable.rb b/Library/Homebrew/downloadable.rb
index a39d5d7b48..037e9ad0d6 100644
--- a/Library/Homebrew/downloadable.rb
+++ b/Library/Homebrew/downloadable.rb
@@ -10,6 +10,7 @@ module Downloadable
   extend T::Helpers
 
   abstract!
+  requires_ancestor { Kernel }
 
   sig { overridable.returns(T.nilable(URL)) }
   attr_reader :url
diff --git a/Library/Homebrew/downloadable.rbi b/Library/Homebrew/downloadable.rbi
deleted file mode 100644
index 2b50bad576..0000000000
--- a/Library/Homebrew/downloadable.rbi
+++ /dev/null
@@ -1,5 +0,0 @@
-# typed: strict
-
-module Downloadable
-  requires_ancestor { Kernel }
-end
diff --git a/Library/Homebrew/exceptions.rb b/Library/Homebrew/exceptions.rb
index 36a7a3ff43..c03f9569e9 100644
--- a/Library/Homebrew/exceptions.rb
+++ b/Library/Homebrew/exceptions.rb
@@ -197,6 +197,10 @@ end
 
 # Shared methods for formula unreadable errors.
 module FormulaUnreadableErrorModule
+  extend T::Helpers
+
+  requires_ancestor { FormulaOrCaskUnavailableError }
+
   attr_reader :formula_error
 
   sig { returns(String) }
diff --git a/Library/Homebrew/exceptions.rbi b/Library/Homebrew/exceptions.rbi
deleted file mode 100644
index 37a9953056..0000000000
--- a/Library/Homebrew/exceptions.rbi
+++ /dev/null
@@ -1,5 +0,0 @@
-# typed: strict
-
-module FormulaUnreadableErrorModule
-  requires_ancestor { FormulaOrCaskUnavailableError }
-end
diff --git a/Library/Homebrew/extend/ENV/shared.rb b/Library/Homebrew/extend/ENV/shared.rb
index 84919ea421..d80724a8fa 100644
--- a/Library/Homebrew/extend/ENV/shared.rb
+++ b/Library/Homebrew/extend/ENV/shared.rb
@@ -11,8 +11,11 @@ require "development_tools"
 # @see Stdenv
 # @see https://www.rubydoc.info/stdlib/Env Ruby's ENV API
 module SharedEnvExtension
+  extend T::Helpers
   include CompilerConstants
 
+  requires_ancestor { Sorbet::Private::Static::ENVClass }
+
   CC_FLAG_VARS = %w[CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS].freeze
   private_constant :CC_FLAG_VARS
 
diff --git a/Library/Homebrew/extend/ENV/shared.rbi b/Library/Homebrew/extend/ENV/shared.rbi
index 13aa3e5fa2..971159b7e4 100644
--- a/Library/Homebrew/extend/ENV/shared.rbi
+++ b/Library/Homebrew/extend/ENV/shared.rbi
@@ -1,8 +1,6 @@
 # typed: strict
 
 module SharedEnvExtension
-  requires_ancestor { Sorbet::Private::Static::ENVClass }
-
   # Overload to allow `PATH` values.
   sig {
     type_parameters(:U).params(
diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
index f220474ddd..959578c08b 100644
--- a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
+++ b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rb
@@ -6,6 +6,10 @@ require "system_command"
 module UnpackStrategy
   class Zip
     module MacOSZipExtension
+      extend T::Helpers
+
+      requires_ancestor { UnpackStrategy }
+
       private
 
       sig { params(unpack_dir: Pathname, basename: Pathname, verbose: T::Boolean).void }
diff --git a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi b/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
deleted file mode 100644
index dee409eb2d..0000000000
--- a/Library/Homebrew/extend/os/mac/unpack_strategy/zip.rbi
+++ /dev/null
@@ -1,5 +0,0 @@
-# typed: strict
-
-module UnpackStrategy::Zip::MacOSZipExtension
-  requires_ancestor { UnpackStrategy }
-end
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 49f5d0111d..c98c746579 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -2,6 +2,10 @@
 # frozen_string_literal: true
 
 module DiskUsageExtension
+  extend T::Helpers
+
+  requires_ancestor { Pathname }
+
   sig { returns(Integer) }
   def disk_usage
     return @disk_usage if defined?(@disk_usage)
@@ -524,6 +528,10 @@ require "extend/os/pathname"
 require "context"
 
 module ObserverPathnameExtension
+  extend T::Helpers
+
+  requires_ancestor { Pathname }
+
   class << self
     include Context
 
diff --git a/Library/Homebrew/extend/pathname.rbi b/Library/Homebrew/extend/pathname.rbi
deleted file mode 100644
index a682b461ee..0000000000
--- a/Library/Homebrew/extend/pathname.rbi
+++ /dev/null
@@ -1,9 +0,0 @@
-# typed: strict
-
-module DiskUsageExtension
-  requires_ancestor { Pathname }
-end
-
-module ObserverPathnameExtension
-  requires_ancestor { Pathname }
-end
diff --git a/Library/Homebrew/os/linux/elf.rb b/Library/Homebrew/os/linux/elf.rb
index 05277cc223..4a7a1cb06c 100644
--- a/Library/Homebrew/os/linux/elf.rb
+++ b/Library/Homebrew/os/linux/elf.rb
@@ -6,6 +6,8 @@ require "os/linux/ld"
 # {Pathname} extension for dealing with ELF files.
 # @see https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
 module ELFShim
+  extend T::Helpers
+
   MAGIC_NUMBER_OFFSET = 0
   private_constant :MAGIC_NUMBER_OFFSET
   MAGIC_NUMBER_ASCII = "\x7fELF"
@@ -40,6 +42,8 @@ module ELFShim
   ARCHITECTURE_AARCH64 = 0xB7
   private_constant :ARCHITECTURE_AARCH64
 
+  requires_ancestor { Pathname }
+
   def read_uint8(offset)
     read(1, offset).unpack1("C")
   end
diff --git a/Library/Homebrew/os/linux/elf.rbi b/Library/Homebrew/os/linux/elf.rbi
deleted file mode 100644
index 2c99175895..0000000000
--- a/Library/Homebrew/os/linux/elf.rbi
+++ /dev/null
@@ -1,5 +0,0 @@
-# typed: strict
-
-module ELFShim
-  requires_ancestor { Pathname }
-end
diff --git a/Library/Homebrew/os/mac/mach.rb b/Library/Homebrew/os/mac/mach.rb
index a632b3d128..d3e87cf859 100644
--- a/Library/Homebrew/os/mac/mach.rb
+++ b/Library/Homebrew/os/mac/mach.rb
@@ -6,6 +6,9 @@ require "macho"
 # {Pathname} extension for dealing with Mach-O files.
 module MachOShim
   extend Forwardable
+  extend T::Helpers
+
+  requires_ancestor { Pathname }
 
   delegate [:dylib_id] => :macho
 
diff --git a/Library/Homebrew/os/mac/mach.rbi b/Library/Homebrew/os/mac/mach.rbi
deleted file mode 100644
index 7e38fd1dcb..0000000000
--- a/Library/Homebrew/os/mac/mach.rbi
+++ /dev/null
@@ -1,5 +0,0 @@
-# typed: strict
-
-module MachOShim
-  requires_ancestor { Pathname }
-end