Merge branch 'Homebrew:master' into info-json-time

Library/Homebrew/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    bindata (2.4.10)
+    bindata (2.4.11)
     bootsnap (1.13.0)
       msgpack (~> 1.2)
     byebug (11.1.3)
@@ -92,7 +92,7 @@ GEM
       sorbet-runtime (>= 0.5.9204)
       unparser
     rdiscount (2.2.0.2)
-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
     ronn (0.7.3)
       hpricot (>= 0.8.2)

Library/Homebrew/sorbet/rbi/gems/bindata@2.4.11.rbi

@@ -456,6 +456,10 @@ class BinData::DelayedIO < ::BinData::Base
   def do_num_bytes; end
   def do_read(io); end
   def do_write(io); end
+  def eval_parameter(key, overrides = T.unsafe(nil)); end
+  def eval_parameter_with_delayed_io(key, overrides = T.unsafe(nil)); end
+  def eval_parameter_without_delayed_io(key, overrides = T.unsafe(nil)); end
+  def include_obj?; end
   def initialize_instance; end
   def method_missing(symbol, *args, &block); end
   def num_bytes; end

Library/Homebrew/sorbet/rbi/gems/regexp_parser@2.6.0.rbi

@@ -8,11 +8,16 @@ module Regexp::Expression; end
 
 class Regexp::Expression::Alternation < ::Regexp::Expression::SequenceOperation
   def alternatives; end
+  def human_name; end
   def match_length; end
 end
 
 Regexp::Expression::Alternation::OPERAND = Regexp::Expression::Alternative
-class Regexp::Expression::Alternative < ::Regexp::Expression::Sequence; end
+
+class Regexp::Expression::Alternative < ::Regexp::Expression::Sequence
+  def human_name; end
+end
+
 module Regexp::Expression::Anchor; end
 Regexp::Expression::Anchor::BOL = Regexp::Expression::Anchor::BeginningOfLine
 Regexp::Expression::Anchor::BOS = Regexp::Expression::Anchor::BeginningOfString
@@ -21,27 +26,64 @@ class Regexp::Expression::Anchor::Base < ::Regexp::Expression::Base
   def match_length; end
 end
 
-class Regexp::Expression::Anchor::BeginningOfLine < ::Regexp::Expression::Anchor::Base; end
+class Regexp::Expression::Anchor::BeginningOfLine < ::Regexp::Expression::Anchor::Base
-class Regexp::Expression::Anchor::BeginningOfString < ::Regexp::Expression::Anchor::Base; end
+  def human_name; end
+end
+
+class Regexp::Expression::Anchor::BeginningOfString < ::Regexp::Expression::Anchor::Base
+  def human_name; end
+end
+
 Regexp::Expression::Anchor::EOL = Regexp::Expression::Anchor::EndOfLine
 Regexp::Expression::Anchor::EOS = Regexp::Expression::Anchor::EndOfString
 Regexp::Expression::Anchor::EOSobEOL = Regexp::Expression::Anchor::EndOfStringOrBeforeEndOfLine
-class Regexp::Expression::Anchor::EndOfLine < ::Regexp::Expression::Anchor::Base; end
+
-class Regexp::Expression::Anchor::EndOfString < ::Regexp::Expression::Anchor::Base; end
+class Regexp::Expression::Anchor::EndOfLine < ::Regexp::Expression::Anchor::Base
-class Regexp::Expression::Anchor::EndOfStringOrBeforeEndOfLine < ::Regexp::Expression::Anchor::Base; end
+  def human_name; end
-class Regexp::Expression::Anchor::MatchStart < ::Regexp::Expression::Anchor::Base; end
+end
-class Regexp::Expression::Anchor::NonWordBoundary < ::Regexp::Expression::Anchor::Base; end
+
-class Regexp::Expression::Anchor::WordBoundary < ::Regexp::Expression::Anchor::Base; end
+class Regexp::Expression::Anchor::EndOfString < ::Regexp::Expression::Anchor::Base
+  def human_name; end
+end
+
+class Regexp::Expression::Anchor::EndOfStringOrBeforeEndOfLine < ::Regexp::Expression::Anchor::Base
+  def human_name; end
+end
+
+class Regexp::Expression::Anchor::MatchStart < ::Regexp::Expression::Anchor::Base
+  def human_name; end
+end
+
+class Regexp::Expression::Anchor::NonWordBoundary < ::Regexp::Expression::Anchor::Base
+  def human_name; end
+end
+
+class Regexp::Expression::Anchor::WordBoundary < ::Regexp::Expression::Anchor::Base
+  def human_name; end
+end
+
 module Regexp::Expression::Assertion; end
 
 class Regexp::Expression::Assertion::Base < ::Regexp::Expression::Group::Base
   def match_length; end
 end
 
-class Regexp::Expression::Assertion::Lookahead < ::Regexp::Expression::Assertion::Base; end
+class Regexp::Expression::Assertion::Lookahead < ::Regexp::Expression::Assertion::Base
-class Regexp::Expression::Assertion::Lookbehind < ::Regexp::Expression::Assertion::Base; end
+  def human_name; end
-class Regexp::Expression::Assertion::NegativeLookahead < ::Regexp::Expression::Assertion::Base; end
+end
-class Regexp::Expression::Assertion::NegativeLookbehind < ::Regexp::Expression::Assertion::Base; end
+
+class Regexp::Expression::Assertion::Lookbehind < ::Regexp::Expression::Assertion::Base
+  def human_name; end
+end
+
+class Regexp::Expression::Assertion::NegativeLookahead < ::Regexp::Expression::Assertion::Base
+  def human_name; end
+end
+
+class Regexp::Expression::Assertion::NegativeLookbehind < ::Regexp::Expression::Assertion::Base
+  def human_name; end
+end
+
 module Regexp::Expression::Backreference; end
 
 class Regexp::Expression::Backreference::Base < ::Regexp::Expression::Base
@@ -57,11 +99,14 @@ end
 class Regexp::Expression::Backreference::Name < ::Regexp::Expression::Backreference::Base
   def initialize(token, options = T.unsafe(nil)); end
 
+  def human_name; end
   def name; end
   def reference; end
 end
 
-class Regexp::Expression::Backreference::NameCall < ::Regexp::Expression::Backreference::Name; end
+class Regexp::Expression::Backreference::NameCall < ::Regexp::Expression::Backreference::Name
+  def human_name; end
+end
 
 class Regexp::Expression::Backreference::NameRecursionLevel < ::Regexp::Expression::Backreference::Name
   def initialize(token, options = T.unsafe(nil)); end
@@ -72,14 +117,20 @@ end
 class Regexp::Expression::Backreference::Number < ::Regexp::Expression::Backreference::Base
   def initialize(token, options = T.unsafe(nil)); end
 
+  def human_name; end
   def number; end
   def reference; end
 end
 
-class Regexp::Expression::Backreference::NumberCall < ::Regexp::Expression::Backreference::Number; end
+class Regexp::Expression::Backreference::NumberCall < ::Regexp::Expression::Backreference::Number
-class Regexp::Expression::Backreference::NumberCallRelative < ::Regexp::Expression::Backreference::NumberRelative; end
+  def human_name; end
+end
 
-class Regexp::Expression::Backreference::NumberRecursionLevel < ::Regexp::Expression::Backreference::Number
+class Regexp::Expression::Backreference::NumberCallRelative < ::Regexp::Expression::Backreference::NumberRelative
+  def human_name; end
+end
+
+class Regexp::Expression::Backreference::NumberRecursionLevel < ::Regexp::Expression::Backreference::NumberRelative
   def initialize(token, options = T.unsafe(nil)); end
 
   def recursion_level; end
@@ -88,6 +139,7 @@ end
 class Regexp::Expression::Backreference::NumberRelative < ::Regexp::Expression::Backreference::Number
   def effective_number; end
   def effective_number=(_arg0); end
+  def human_name; end
   def reference; end
 end
 
@@ -125,7 +177,6 @@ class Regexp::Expression::Base
   def options=(_arg0); end
   def possessive?; end
   def quantifier; end
-  def quantifier=(_arg0); end
   def quantify(*args); end
   def quantity; end
   def reluctant?; end
@@ -175,10 +226,12 @@ class Regexp::Expression::CharacterSet < ::Regexp::Expression::Subexpression
 end
 
 class Regexp::Expression::CharacterSet::IntersectedSequence < ::Regexp::Expression::Sequence
+  def human_name; end
   def match_length; end
 end
 
 class Regexp::Expression::CharacterSet::Intersection < ::Regexp::Expression::SequenceOperation
+  def human_name; end
   def match_length; end
 end
 
@@ -187,6 +240,7 @@ Regexp::Expression::CharacterSet::Intersection::OPERAND = Regexp::Expression::Ch
 class Regexp::Expression::CharacterSet::Range < ::Regexp::Expression::Subexpression
   def <<(exp); end
   def complete?; end
+  def human_name; end
   def match_length; end
   def parts; end
   def starts_at; end
@@ -194,7 +248,10 @@ class Regexp::Expression::CharacterSet::Range < ::Regexp::Expression::Subexpress
 end
 
 module Regexp::Expression::CharacterType; end
-class Regexp::Expression::CharacterType::Any < ::Regexp::Expression::CharacterType::Base; end
+
+class Regexp::Expression::CharacterType::Any < ::Regexp::Expression::CharacterType::Base
+  def human_name; end
+end
 
 class Regexp::Expression::CharacterType::Base < ::Regexp::Expression::Base
   def match_length; end
@@ -210,11 +267,19 @@ class Regexp::Expression::CharacterType::NonSpace < ::Regexp::Expression::Charac
 class Regexp::Expression::CharacterType::NonWord < ::Regexp::Expression::CharacterType::Base; end
 class Regexp::Expression::CharacterType::Space < ::Regexp::Expression::CharacterType::Base; end
 class Regexp::Expression::CharacterType::Word < ::Regexp::Expression::CharacterType::Base; end
-class Regexp::Expression::Comment < ::Regexp::Expression::FreeSpace; end
+
+class Regexp::Expression::Comment < ::Regexp::Expression::FreeSpace
+  def human_name; end
+end
+
 module Regexp::Expression::Conditional; end
-class Regexp::Expression::Conditional::Branch < ::Regexp::Expression::Sequence; end
+
+class Regexp::Expression::Conditional::Branch < ::Regexp::Expression::Sequence
+  def human_name; end
+end
 
 class Regexp::Expression::Conditional::Condition < ::Regexp::Expression::Base
+  def human_name; end
   def match_length; end
   def reference; end
   def referenced_expression; end
@@ -232,6 +297,7 @@ class Regexp::Expression::Conditional::Expression < ::Regexp::Expression::Subexp
   def branches; end
   def condition; end
   def condition=(exp); end
+  def human_name; end
   def match_length; end
   def parts; end
   def reference; end
@@ -328,6 +394,7 @@ end
 
 class Regexp::Expression::Group::Capture < ::Regexp::Expression::Group::Base
   def capturing?; end
+  def human_name; end
   def identifier; end
   def number; end
   def number=(_arg0); end
@@ -343,6 +410,7 @@ end
 class Regexp::Expression::Group::Named < ::Regexp::Expression::Group::Capture
   def initialize(token, options = T.unsafe(nil)); end
 
+  def human_name; end
   def identifier; end
   def name; end
 
@@ -354,6 +422,7 @@ end
 class Regexp::Expression::Group::Options < ::Regexp::Expression::Group::Base
   def option_changes; end
   def option_changes=(_arg0); end
+  def quantify(*args); end
 
   private
 
@@ -371,10 +440,12 @@ end
 module Regexp::Expression::Keep; end
 
 class Regexp::Expression::Keep::Mark < ::Regexp::Expression::Base
+  def human_name; end
   def match_length; end
 end
 
 class Regexp::Expression::Literal < ::Regexp::Expression::Base
+  def human_name; end
   def match_length; end
 end
 
@@ -406,7 +477,6 @@ class Regexp::Expression::Quantifier
   def options=(_arg0); end
   def possessive?; end
   def quantifier; end
-  def quantifier=(_arg0); end
   def reluctant?; end
   def set_level; end
   def set_level=(_arg0); end
@@ -431,6 +501,8 @@ end
 Regexp::Expression::Quantifier::MODES = T.let(T.unsafe(nil), Array)
 
 class Regexp::Expression::Root < ::Regexp::Expression::Subexpression
+  def human_name; end
+
   class << self
     def build(options = T.unsafe(nil)); end
   end
@@ -466,12 +538,15 @@ module Regexp::Expression::Shared
   def coded_offset; end
   def eql?(other); end
   def full_length; end
+  def human_name; end
   def is?(test_token, test_type = T.unsafe(nil)); end
   def nesting_level=(lvl); end
   def offset; end
   def one_of?(scope, top = T.unsafe(nil)); end
+  def optional?; end
   def parts; end
   def quantified?; end
+  def quantifier=(qtf); end
   def quantifier_affix(expression_format); end
   def starts_at; end
   def terminal?; end
@@ -620,6 +695,7 @@ class Regexp::Expression::UnicodeProperty::XPosixPunct < ::Regexp::Expression::U
 class Regexp::Expression::UnicodeProperty::Xdigit < ::Regexp::Expression::UnicodeProperty::Base; end
 
 class Regexp::Expression::WhiteSpace < ::Regexp::Expression::FreeSpace
+  def human_name; end
   def merge(exp); end
 end
 

Library/Homebrew/vendor/bundle/bundler/setup.rb

@@ -12,13 +12,13 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/activesupport-6.1.7/l
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/public_suffix-5.0.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/addressable-2.8.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ast-2.4.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.10/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bindata-2.4.11/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/msgpack-1.5.6"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/msgpack-1.5.6"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/msgpack-1.5.6/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/bootsnap-1.13.0"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/bootsnap-1.13.0"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/bootsnap-1.13.0/lib"
 $:.unshift "#{path}/"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/byebug-11.1.3"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/byebug-11.1.3"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/byebug-11.1.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coderay-1.1.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/highline-2.0.3/lib"
@@ -27,18 +27,18 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/connection_pool-2.3.0
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/did_you_mean-1.6.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/diff-lcs-1.5.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.4.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/unf_ext-0.0.8.2"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/unf_ext-0.0.8.2"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf_ext-0.0.8.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unf-0.1.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/domain_name-0.5.20190701/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/regexp_parser-2.5.0/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/regexp_parser-2.6.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ecma-re-validator-0.4.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/elftools-1.1.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/hana-1.3.7/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/hpricot-0.8.6"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/hpricot-0.8.6"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/hpricot-0.8.6/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/http-cookie-1.0.5/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/json-2.6.2"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/json-2.6.2"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json-2.6.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/uri_template-0.7.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/json_schemer-0.2.21/lib"
@@ -47,7 +47,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mime-types-3.4.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/net-http-digest_auth-1.4.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/net-http-persistent-4.0.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/mini_portile2-2.8.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/racc-1.6.0"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/racc-1.6.0"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/racc-1.6.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/nokogiri-1.13.8-x86_64-darwin/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rubyntlm-0.6.3/lib"
@@ -68,7 +68,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/pry-0.14.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rack-3.0.0/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unparser-0.6.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rbi-0.0.14/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-15/2.6.0-static/rdiscount-2.2.0.2"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/universal-darwin-21/2.6.0/rdiscount-2.2.0.2"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rdiscount-2.2.0.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rexml-3.2.5/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/ronn-0.7.3/lib"
@@ -96,7 +96,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.12.3
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov_json_formatter-0.1.4/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.21.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-cobertura-2.1.0/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-static-0.5.10175-universal-darwin-15/lib"
+$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-static-0.5.10175-universal-darwin-21/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-0.5.10175/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/sorbet-static-and-runtime-0.5.10175/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/thor-1.2.1/lib"

Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.10/lib/bindata/version.rb

@@ -1,3 +0,0 @@
-module BinData
-  VERSION = "2.4.10"
-end

Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/delayed_io.rb

@@ -116,9 +116,25 @@ module BinData
       0
     end
 
+    def eval_parameter_with_delayed_io(key, overrides = nil)
+      result = eval_parameter_without_delayed_io(key, overrides)
+
+      # Delay processing :onlyif until we do the actual read/write
+      result = true if key == :onlyif && ! result
+
+      result
+    end
+    alias_method :eval_parameter_without_delayed_io, :eval_parameter
+    alias_method :eval_parameter, :eval_parameter_with_delayed_io
+
+    def include_obj?
+      ! has_parameter?(:onlyif) || eval_parameter_without_delayed_io(:onlyif)
+    end
+
     # DelayedIO objects aren't read when #read is called.
     # The reading is delayed until this method is called.
     def read_now!
+      return unless include_obj?
       raise IOError, "read from where?" unless @read_io
 
       @read_io.seekbytes(abs_offset - @read_io.offset)
@@ -130,7 +146,9 @@ module BinData
     # DelayedIO objects aren't written when #write is called.
     # The writing is delayed until this method is called.
     def write_now!
+      return unless include_obj?
       raise IOError, "write to where?" unless @write_io
+
       @write_io.seekbytes(abs_offset - @write_io.offset)
       @type.do_write(@write_io)
     end

Library/Homebrew/vendor/bundle/ruby/2.6.0/gems/bindata-2.4.11/lib/bindata/version.rb

@@ -0,0 +1,3 @@
+module BinData
+  VERSION = "2.4.11"
+end