Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate Parlour extensions to Tapioca compilers #18571

Merged
merged 2 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Library/.rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ AllCops:
- "**/*.rbi"
Exclude:
- "Homebrew/sorbet/rbi/{dsl,gems}/**/*.rbi"
- "Homebrew/sorbet/rbi/parlour.rbi"
- "Homebrew/bin/*"
- "Homebrew/vendor/**/*"
- "Taps/*/*/vendor/**/*"
Expand Down
10 changes: 0 additions & 10 deletions Library/Homebrew/.parlour

This file was deleted.

1 change: 0 additions & 1 deletion Library/Homebrew/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ group :tests, optional: true do
end
group :typecheck, optional: true do
gem "method_source", require: false
gem "parlour", require: false
gem "sorbet-static-and-runtime", require: false
gem "spoom", require: false
gem "tapioca", require: false
Expand Down
9 changes: 0 additions & 9 deletions Library/Homebrew/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,13 @@ GEM
bigdecimal (3.1.8)
bindata (2.5.0)
coderay (1.1.3)
commander (5.0.0)
highline (~> 3.0.0)
concurrent-ruby (1.3.4)
diff-lcs (1.5.1)
docile (1.4.1)
elftools (1.3.1)
bindata (~> 2)
erubi (1.13.0)
hana (1.3.7)
highline (3.0.1)
json (2.7.2)
json_schemer (2.3.0)
bigdecimal
Expand All @@ -33,11 +30,6 @@ GEM
parallel (1.26.3)
parallel_tests (4.7.2)
parallel
parlour (9.0.0)
commander (~> 5.0)
parser
rainbow (~> 3.0)
sorbet-runtime (>= 0.5)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
Expand Down Expand Up @@ -167,7 +159,6 @@ DEPENDENCIES
method_source
minitest
parallel_tests
parlour
patchelf
plist
pry
Expand Down
4 changes: 4 additions & 0 deletions Library/Homebrew/attrable.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# typed: strict
# frozen_string_literal: true

# This module provides methods to define specialized attributes.
# Method stubs are generated by the {Tapioca::Compilers::Attrables} compiler.
# @note The compiler is fragile, and must be updated if the filename changes, if methods are added or removed,
# or if a method's arity changes.
module Attrable
extend T::Helpers

Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/cask/artifact/abstract_artifact.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ class AbstractArtifact
abstract!

include Comparable
extend Attrable
MikeMcQuaid marked this conversation as resolved.
Show resolved Hide resolved

def self.english_name
@english_name ||= T.must(name).sub(/^.*:/, "").gsub(/(.)([A-Z])/, '\1 \2')
Expand Down
8 changes: 1 addition & 7 deletions Library/Homebrew/cask/url.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

module Cask
# Class corresponding to the `url` stanza.
class URL < Delegator
class URL < SimpleDelegator
class DSL
attr_reader :uri, :tag, :branch, :revisions, :revision,
:trust_cert, :cookies, :header, :data, :only_path
Expand Down Expand Up @@ -278,12 +278,6 @@ def from_block?

private

def __getobj__ = @dsl

def __setobj__(dsl)
@dsl = dsl
end

sig { returns(T.nilable(String)) }
def raw_url_line
return @raw_url_line if defined?(@raw_url_line)
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/dependency.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#
# @api internal
class Dependency
extend Forwardable
include Dependable
extend Cachable

Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/dev-cmd/typecheck.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ def run

ohai "Updating Tapioca RBI files..."
safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args
safe_system "bundle", "exec", "parlour"

if args.suggest_typed?
ohai "Checking if we can bump Sorbet `typed` sigils..."
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/download_strategy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class Mechanize; end

# @abstract Abstract superclass for all download strategies.
class AbstractDownloadStrategy
extend Forwardable
include FileUtils
include Context
include SystemCommand::Mixin
Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/rubocops/cask/stanza_order.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module Cask
# @see https://docs.brew.sh/Cask-Cookbook#stanza-order
class StanzaOrder < Base
include IgnoredNode
extend Forwardable
extend AutoCorrector
include CaskHelp

Expand Down
1 change: 0 additions & 1 deletion Library/Homebrew/rubocops/cask/url.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ module Cask
# ```
class Url < Base
extend AutoCorrector
extend Forwardable
include OnUrlStanza
include UrlHelper

Expand Down
43 changes: 0 additions & 43 deletions Library/Homebrew/sorbet/parlour.rb

This file was deleted.

162 changes: 0 additions & 162 deletions Library/Homebrew/sorbet/parlour/attr.rb

This file was deleted.

8 changes: 8 additions & 0 deletions Library/Homebrew/sorbet/rbi/dsl/arch_requirement.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions Library/Homebrew/sorbet/rbi/dsl/bottle.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions Library/Homebrew/sorbet/rbi/dsl/bottle_specification.rbi

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading