Merge pull request #13242 from carlocab/Formula.all

cmd/info: use `Formula.all`
This commit is contained in:
Carlo Cabrera 2022-05-04 17:06:39 +08:00 committed by GitHub
commit dc4d504bee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -193,7 +193,7 @@ module Homebrew
raise UsageError, "cannot specify --cask with --json=v1!" if args.cask? raise UsageError, "cannot specify --cask with --json=v1!" if args.cask?
formulae = if args.all? formulae = if args.all?
Formula.sort Formula.all.sort
elsif args.installed? elsif args.installed?
Formula.installed.sort Formula.installed.sort
else else
@ -207,7 +207,7 @@ module Homebrew
end end
when :v2 when :v2
formulae, casks = if args.all? formulae, casks = if args.all?
[Formula.sort, Cask::Cask.all.sort_by(&:full_name)] [Formula.all.sort, Cask::Cask.all.sort_by(&:full_name)]
elsif args.installed? elsif args.installed?
[Formula.installed.sort, Cask::Caskroom.casks.sort_by(&:full_name)] [Formula.installed.sort, Cask::Caskroom.casks.sort_by(&:full_name)]
else else