Remove @uses_from_macos_elements variable.

This commit is contained in:
Markus Reiter 2024-02-12 23:21:28 +01:00
parent a783aaf03f
commit 4762f644cb
No known key found for this signature in database
GPG Key ID: 245293B51702655B

View File

@ -46,7 +46,6 @@ class SoftwareSpec
@deprecated_options = [] @deprecated_options = []
@build = BuildOptions.new(Options.create(@flags), options) @build = BuildOptions.new(Options.create(@flags), options)
@compiler_failures = [] @compiler_failures = []
@uses_from_macos_elements = []
end end
def initialize_dup(other) def initialize_dup(other)
@ -62,7 +61,6 @@ class SoftwareSpec
@deprecated_options = @deprecated_options.dup @deprecated_options = @deprecated_options.dup
@build = @build.dup @build = @build.dup
@compiler_failures = @compiler_failures.dup @compiler_failures = @compiler_failures.dup
@uses_from_macos_elements = @uses_from_macos_elements.dup
end end
def freeze def freeze
@ -77,7 +75,6 @@ class SoftwareSpec
@deprecated_options.freeze @deprecated_options.freeze
@build.freeze @build.freeze
@compiler_failures.freeze @compiler_failures.freeze
@uses_from_macos_elements.freeze
super super
end end
@ -198,24 +195,19 @@ class SoftwareSpec
spec, tags = deps.is_a?(Hash) ? deps.first : deps spec, tags = deps.is_a?(Hash) ? deps.first : deps
raise TypeError, "Dependency name must be a string!" unless spec.is_a?(String) raise TypeError, "Dependency name must be a string!" unless spec.is_a?(String)
@uses_from_macos_elements << deps
depends_on UsesFromMacOSDependency.new(spec, Array(tags), bounds: bounds) depends_on UsesFromMacOSDependency.new(spec, Array(tags), bounds: bounds)
end end
# @deprecated # @deprecated
def uses_from_macos_elements def uses_from_macos_elements
# TODO: remove all @uses_from_macos_elements when removing this method # TODO: Remember to remove the delegate from `Formula`.
# Also remember to remove the delegate from formula.rb
odisabled "#uses_from_macos_elements", "#declared_deps" odisabled "#uses_from_macos_elements", "#declared_deps"
@uses_from_macos_elements
end end
# @deprecated # @deprecated
def uses_from_macos_names def uses_from_macos_names
# TODO: Remember to remove the delegate from formula.rb # TODO: Remember to remove the delegate from `Formula`.
odisabled "#uses_from_macos_names", "#declared_deps" odisabled "#uses_from_macos_names", "#declared_deps"
uses_from_macos_elements.flat_map { |e| e.is_a?(Hash) ? e.keys : e }
end end
def deps def deps