sorbet: Delete unused nilable? method; regenerate RBIs; fix errors

This commit is contained in:
Issy Long 2023-03-12 22:44:31 +00:00
parent 169ae0e155
commit c6ff9b59c0
No known key found for this signature in database
GPG Key ID: 8247C390DADC67D4
3 changed files with 24 additions and 28 deletions

View File

@ -1,10 +1,10 @@
# typed: strict # typed: strict
module Homebrew::EnvConfig module Homebrew::EnvConfig
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.additional_google_analytics_id; end def self.additional_google_analytics_id; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.all_proxy; end def self.all_proxy; end
sig { returns(Integer) } sig { returns(Integer) }
@ -16,10 +16,10 @@ module Homebrew::EnvConfig
sig { returns(String) } sig { returns(String) }
def self.arch; end def self.arch; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.artifact_domain; end def self.artifact_domain; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.auto_update_secs; end def self.auto_update_secs; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
@ -28,10 +28,10 @@ module Homebrew::EnvConfig
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.bat?; end def self.bat?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.bat_config_path; end def self.bat_config_path; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.bat_theme; end def self.bat_theme; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
@ -82,16 +82,16 @@ module Homebrew::EnvConfig
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.disable_load_formula?; end def self.disable_load_formula?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.display; end def self.display; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.display_install_times?; end def self.display_install_times?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.docker_registry_basic_auth_token; end def self.docker_registry_basic_auth_token; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.docker_registry_token; end def self.docker_registry_token; end
sig { returns(T.nilable(String)) } sig { returns(T.nilable(String)) }
@ -103,7 +103,7 @@ module Homebrew::EnvConfig
sig { returns(Integer) } sig { returns(Integer) }
def self.fail_log_lines; end def self.fail_log_lines; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.forbidden_licenses; end def self.forbidden_licenses; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
@ -118,13 +118,13 @@ module Homebrew::EnvConfig
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.force_vendor_ruby?; end def self.force_vendor_ruby?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.ftp_proxy; end def self.ftp_proxy; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.git_email; end def self.git_email; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.git_name; end def self.git_name; end
sig { returns(String) } sig { returns(String) }
@ -133,16 +133,16 @@ module Homebrew::EnvConfig
sig { returns(T.nilable(String)) } sig { returns(T.nilable(String)) }
def self.github_api_token; end def self.github_api_token; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.github_packages_token; end def self.github_packages_token; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.github_packages_user; end def self.github_packages_user; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.http_proxy; end def self.http_proxy; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.https_proxy; end def self.https_proxy; end
sig { returns(String) } sig { returns(String) }
@ -163,7 +163,7 @@ module Homebrew::EnvConfig
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.no_bootsnap?; end def self.no_bootsnap?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.no_cleanup_formulae; end def self.no_cleanup_formulae; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
@ -199,10 +199,10 @@ module Homebrew::EnvConfig
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.no_installed_dependents_check?; end def self.no_installed_dependents_check?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.no_proxy; end def self.no_proxy; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.pip_index_url; end def self.pip_index_url; end
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
@ -217,13 +217,13 @@ module Homebrew::EnvConfig
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def self.sorbet_runtime?; end def self.sorbet_runtime?; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.ssh_config_path; end def self.ssh_config_path; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.sudo_askpass; end def self.sudo_askpass; end
sig { returns(String) } sig { returns(T.nilable(String)) }
def self.svn; end def self.svn; end
sig { returns(String) } sig { returns(String) }

View File

@ -296,7 +296,7 @@ class Resource
# PyPI packages: PEP 503 Simple Repository API <https://peps.python.org/pep-0503> # PyPI packages: PEP 503 Simple Repository API <https://peps.python.org/pep-0503>
if Homebrew::EnvConfig.pip_index_url.present? if Homebrew::EnvConfig.pip_index_url.present?
pip_index_base_url = Homebrew::EnvConfig.pip_index_url.chomp("/").chomp("/simple") pip_index_base_url = T.must(Homebrew::EnvConfig.pip_index_url).chomp("/").chomp("/simple")
%w[https://files.pythonhosted.org https://pypi.org].each do |base_url| %w[https://files.pythonhosted.org https://pypi.org].each do |base_url|
extra_urls << url.sub(base_url, pip_index_base_url) if url.start_with?("#{base_url}/packages") extra_urls << url.sub(base_url, pip_index_base_url) if url.start_with?("#{base_url}/packages")
end end

View File

@ -4,10 +4,6 @@
require_relative "../../global" require_relative "../../global"
require_relative "../../env_config" require_relative "../../env_config"
def nilable?(method)
%w[browser editor github_api_token].include?(method)
end
File.open("#{__dir__}/../../env_config.rbi", "w") do |file| File.open("#{__dir__}/../../env_config.rbi", "w") do |file|
file.write(<<~RUBY) file.write(<<~RUBY)
# typed: strict # typed: strict