From 07fad780de762d75a34e240860c129d12330eb4c Mon Sep 17 00:00:00 2001 From: Douglas Eichelberger Date: Sun, 4 Feb 2024 06:01:02 -0800 Subject: [PATCH] Remove hidden defs references --- .gitignore | 1 - Library/.rubocop.yml | 1 - Library/Homebrew/dev-cmd/typecheck.rb | 12 ------------ .../sorbet/hidden_definitions_hacks/webrick.rb | 4 ---- 4 files changed, 18 deletions(-) delete mode 100644 Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb diff --git a/.gitignore b/.gitignore index 50bf06a265..c4cc9d81b9 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,6 @@ /Library/Taps /Library/PinnedTaps /Library/Homebrew/.byebug_history -/Library/Homebrew/sorbet/rbi/hidden-definitions/errors.txt # Ignore Bundler files **/.bundle/bin diff --git a/Library/.rubocop.yml b/Library/.rubocop.yml index a53fd285f8..b024cb4dc3 100644 --- a/Library/.rubocop.yml +++ b/Library/.rubocop.yml @@ -18,7 +18,6 @@ AllCops: - "**/*.rbi" Exclude: - "Homebrew/sorbet/rbi/gems/**/*.rbi" - - "Homebrew/sorbet/rbi/hidden-definitions/*.rbi" - "Homebrew/bin/*" - "Homebrew/vendor/**/*" - "Taps/*/*/vendor/**/*" diff --git a/Library/Homebrew/dev-cmd/typecheck.rb b/Library/Homebrew/dev-cmd/typecheck.rb index 7378baf7c0..3f2a03ed9c 100644 --- a/Library/Homebrew/dev-cmd/typecheck.rb +++ b/Library/Homebrew/dev-cmd/typecheck.rb @@ -60,18 +60,6 @@ module Homebrew safe_system "bundle", "exec", "tapioca", "gem", *tapioca_args safe_system "bundle", "exec", "parlour" - safe_system({ "RUBYLIB" => "#{HOMEBREW_LIBRARY_PATH}/sorbet/hidden_definitions_hacks" }, - "bundle", "exec", "srb", "rbi", "hidden-definitions") - # HACK: we'll phase out hidden-definitions soon - tmp_file = "sorbet/rbi/hidden-definitions/hidden.rbi.tmp" - orig_file = "sorbet/rbi/hidden-definitions/hidden.rbi" - File.open(tmp_file, "w") do |out_file| - File.foreach(orig_file) do |line| - out_file.puts line unless line.include?("def self.new(*args, **arg, &blk); end") - end - end - File.rename(tmp_file, orig_file) - if args.suggest_typed? ohai "Bumping Sorbet `typed` sigils..." # --sorbet needed because of https://github.com/Shopify/spoom/issues/488 diff --git a/Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb b/Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb deleted file mode 100644 index e8251a00ec..0000000000 --- a/Library/Homebrew/sorbet/hidden_definitions_hacks/webrick.rb +++ /dev/null @@ -1,4 +0,0 @@ -# typed: strict -# frozen_string_literal: true - -# This file intentionally left blank