From f96fffbed89d8857e4fbb468606d53bdf69f95a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Nov 2021 01:30:03 +0000 Subject: [PATCH 1/4] build(deps): bump rbi from 0.0.6 to 0.0.7 in /Library/Homebrew Bumps [rbi](https://github.com/Shopify/rbi) from 0.0.6 to 0.0.7. - [Release notes](https://github.com/Shopify/rbi/releases) - [Commits](https://github.com/Shopify/rbi/compare/v0.0.6...v0.0.7) --- updated-dependencies: - dependency-name: rbi dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Library/Homebrew/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index e8d4804f5a..67a472b4df 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -85,7 +85,7 @@ GEM racc (1.6.0) rack (2.2.3) rainbow (3.0.0) - rbi (0.0.6) + rbi (0.0.7) ast parser sorbet-runtime (>= 0.5.9204) From 17ac7ec75da8b46575572a446ba39a9cbdc5740e Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 18 Nov 2021 01:34:22 +0000 Subject: [PATCH 2/4] brew vendor-gems: commit updates. --- Library/Homebrew/vendor/bundle/bundler/setup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb index 7e1f3a2f83..332fad7143 100644 --- a/Library/Homebrew/vendor/bundle/bundler/setup.rb +++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb @@ -65,7 +65,7 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/plist-3.6.0/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/pry-0.14.1/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rack-2.2.3/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/unparser-0.6.2/lib" -$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rbi-0.0.6/lib" +$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/rbi-0.0.7/lib" $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/extensions/x86_64-darwin-14/2.6.0-static/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" From fa3bf7804fa96340b6e004e7a5b54ef95f898a83 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 18 Nov 2021 01:39:47 +0000 Subject: [PATCH 3/4] Update RBI files for rbi. --- .../rbi/gems/{rbi@0.0.6.rbi => rbi@0.0.7.rbi} | 98 ++++++++++++++++--- 1 file changed, 83 insertions(+), 15 deletions(-) rename Library/Homebrew/sorbet/rbi/gems/{rbi@0.0.6.rbi => rbi@0.0.7.rbi} (94%) diff --git a/Library/Homebrew/sorbet/rbi/gems/rbi@0.0.6.rbi b/Library/Homebrew/sorbet/rbi/gems/rbi@0.0.7.rbi similarity index 94% rename from Library/Homebrew/sorbet/rbi/gems/rbi@0.0.6.rbi rename to Library/Homebrew/sorbet/rbi/gems/rbi@0.0.7.rbi index d1fb46c60e..75abb7c021 100644 --- a/Library/Homebrew/sorbet/rbi/gems/rbi@0.0.6.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/rbi@0.0.7.rbi @@ -1,9 +1,9 @@ +# typed: true + # DO NOT EDIT MANUALLY # This is an autogenerated file for types exported from the `rbi` gem. # Please instead update this file by running `bin/tapioca gem rbi`. -# typed: true - module RBI; end class RBI::ASTVisitor @@ -108,6 +108,14 @@ class RBI::AttrWriter < ::RBI::Attr def to_s; end end +class RBI::BlankLine < ::RBI::Comment + sig { params(loc: T.nilable(RBI::Loc)).void } + def initialize(loc: T.unsafe(nil)); end + + sig { override.params(v: RBI::Printer).void } + def accept_printer(v); end +end + class RBI::BlockParam < ::RBI::Param sig { params(name: String, loc: T.nilable(RBI::Loc), comments: T::Array[RBI::Comment], block: T.nilable(T.proc.params(node: RBI::BlockParam).void)).void } def initialize(name, loc: T.unsafe(nil), comments: T.unsafe(nil), &block); end @@ -223,14 +231,6 @@ class RBI::ConstBuilder < ::RBI::ASTVisitor end end -class RBI::EmptyComment < ::RBI::Comment - sig { params(loc: T.nilable(RBI::Loc)).void } - def initialize(loc: T.unsafe(nil)); end - - sig { override.params(v: RBI::Printer).void } - def accept_printer(v); end -end - class RBI::Error < ::StandardError; end class RBI::Extend < ::RBI::Mixin @@ -264,17 +264,36 @@ class RBI::File def comments=(_arg0); end + sig { returns(T::Boolean) } + def empty?; end + sig { params(out: T.any(IO, StringIO), indent: Integer, print_locs: T::Boolean).void } def print(out: T.unsafe(nil), indent: T.unsafe(nil), print_locs: T.unsafe(nil)); end sig { returns(RBI::Tree) } def root; end + def root=(_arg0); end + + sig { void } + def set_empty_body_content; end + + sig { params(command: String, reason: T.nilable(String), display_heading: T::Boolean).void } + def set_file_header(command, reason: T.unsafe(nil), display_heading: T.unsafe(nil)); end + sig { returns(T.nilable(String)) } def strictness; end + def strictness=(_arg0); end + sig { params(indent: Integer, print_locs: T::Boolean).returns(String) } def string(indent: T.unsafe(nil), print_locs: T.unsafe(nil)); end + + sig { void } + def transform_rbi!; end + + sig { returns(String) } + def transformed_string; end end class RBI::Group < ::RBI::Tree @@ -447,6 +466,14 @@ class RBI::Loc end end +class RBI::MergeTree < ::RBI::Tree + sig { params(loc: T.nilable(RBI::Loc), comments: T::Array[RBI::Comment], conflicts: T::Array[RBI::Rewriters::Merge::Conflict], block: T.nilable(T.proc.params(node: RBI::Tree).void)).void } + def initialize(loc: T.unsafe(nil), comments: T.unsafe(nil), conflicts: T.unsafe(nil), &block); end + + sig { returns(T::Array[RBI::Rewriters::Merge::Conflict]) } + def conflicts; end +end + class RBI::Method < ::RBI::NodeWithComments include ::RBI::Indexable @@ -600,6 +627,9 @@ class RBI::Node sig { params(out: T.any(IO, StringIO), indent: Integer, print_locs: T::Boolean).void } def print(out: T.unsafe(nil), indent: T.unsafe(nil), print_locs: T.unsafe(nil)); end + sig { params(v: RBI::Printer).void } + def print_blank_line_before(v); end + sig { params(node: RBI::Node).void } def replace(node); end @@ -613,6 +643,9 @@ class RBI::NodeWithComments < ::RBI::Node sig { params(loc: T.nilable(RBI::Loc), comments: T::Array[RBI::Comment]).void } def initialize(loc: T.unsafe(nil), comments: T.unsafe(nil)); end + sig { returns(T::Array[String]) } + def annotations; end + sig { returns(T::Array[RBI::Comment]) } def comments; end @@ -800,6 +833,35 @@ class RBI::Rewriters::AddSigTemplates < ::RBI::Visitor def add_todo_comment(node); end end +class RBI::Rewriters::Annotate < ::RBI::Visitor + sig { params(annotation: String, annotate_scopes: T::Boolean, annotate_properties: T::Boolean).void } + def initialize(annotation, annotate_scopes: T.unsafe(nil), annotate_properties: T.unsafe(nil)); end + + sig { override.params(node: T.nilable(RBI::Node)).void } + def visit(node); end + + private + + sig { params(node: RBI::NodeWithComments).void } + def annotate_node(node); end + + sig { params(node: RBI::Node).returns(T::Boolean) } + def root?(node); end +end + +class RBI::Rewriters::Deannotate < ::RBI::Visitor + sig { params(annotation: String).void } + def initialize(annotation); end + + sig { override.params(node: T.nilable(RBI::Node)).void } + def visit(node); end + + private + + sig { params(node: RBI::NodeWithComments).void } + def deannotate_node(node); end +end + class RBI::Rewriters::GroupNodes < ::RBI::Visitor sig { override.params(node: T.nilable(RBI::Node)).void } def visit(node); end @@ -809,14 +871,14 @@ class RBI::Rewriters::Merge sig { params(left_name: String, right_name: String, keep: RBI::Rewriters::Merge::Keep).void } def initialize(left_name: T.unsafe(nil), right_name: T.unsafe(nil), keep: T.unsafe(nil)); end - sig { params(tree: RBI::Tree).returns(T::Array[RBI::Rewriters::Merge::Conflict]) } + sig { params(tree: RBI::Tree).void } def merge(tree); end - sig { returns(RBI::Tree) } + sig { returns(RBI::MergeTree) } def tree; end class << self - sig { params(left: RBI::Tree, right: RBI::Tree, left_name: String, right_name: String, keep: RBI::Rewriters::Merge::Keep).returns(RBI::Tree) } + sig { params(left: RBI::Tree, right: RBI::Tree, left_name: String, right_name: String, keep: RBI::Rewriters::Merge::Keep).returns(RBI::MergeTree) } def merge_trees(left, right, left_name: T.unsafe(nil), right_name: T.unsafe(nil), keep: T.unsafe(nil)); end end end @@ -1200,6 +1262,9 @@ class RBI::Tree < ::RBI::NodeWithComments sig { params(with_todo_comment: T::Boolean).void } def add_sig_templates!(with_todo_comment: T.unsafe(nil)); end + sig { params(annotation: String, annotate_scopes: T::Boolean, annotate_properties: T::Boolean).void } + def annotate!(annotation, annotate_scopes: T.unsafe(nil), annotate_properties: T.unsafe(nil)); end + sig { params(name: String, superclass_name: T.nilable(String), block: T.nilable(T.proc.params(scope: RBI::Scope).void)).void } def create_class(name, superclass_name: T.unsafe(nil), &block); end @@ -1227,6 +1292,9 @@ class RBI::Tree < ::RBI::NodeWithComments sig { params(name: String, value: String).void } def create_type_member(name, value: T.unsafe(nil)); end + sig { params(annotation: String).void } + def deannotate!(annotation); end + sig { returns(T::Boolean) } def empty?; end @@ -1236,8 +1304,8 @@ class RBI::Tree < ::RBI::NodeWithComments sig { returns(RBI::Index) } def index; end - sig { params(other: RBI::Tree).returns(RBI::Tree) } - def merge(other); end + sig { params(other: RBI::Tree, left_name: String, right_name: String, keep: RBI::Rewriters::Merge::Keep).returns(RBI::MergeTree) } + def merge(other, left_name: T.unsafe(nil), right_name: T.unsafe(nil), keep: T.unsafe(nil)); end sig { void } def nest_non_public_methods!; end From dbe565eff292a5ab0a4742a55e75095a86eb13ce Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Thu, 18 Nov 2021 01:59:04 +0000 Subject: [PATCH 4/4] Regenerate Tapioca RBI --- Library/Homebrew/sorbet/rbi/gems/tapioca@0.5.4.rbi | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/sorbet/rbi/gems/tapioca@0.5.4.rbi b/Library/Homebrew/sorbet/rbi/gems/tapioca@0.5.4.rbi index b37f15695a..eb002b67ed 100644 --- a/Library/Homebrew/sorbet/rbi/gems/tapioca@0.5.4.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/tapioca@0.5.4.rbi @@ -83,6 +83,8 @@ class RBI::File sig { returns(RBI::Tree) } def root; end + def root=(_arg0); end + sig { void } def set_empty_body_content; end @@ -92,6 +94,8 @@ class RBI::File sig { returns(T.nilable(String)) } def strictness; end + def strictness=(_arg0); end + sig { params(indent: Integer, print_locs: T::Boolean).returns(String) } def string(indent: T.unsafe(nil), print_locs: T.unsafe(nil)); end @@ -115,6 +119,9 @@ class RBI::Tree < ::RBI::NodeWithComments sig { params(with_todo_comment: T::Boolean).void } def add_sig_templates!(with_todo_comment: T.unsafe(nil)); end + sig { params(annotation: String, annotate_scopes: T::Boolean, annotate_properties: T::Boolean).void } + def annotate!(annotation, annotate_scopes: T.unsafe(nil), annotate_properties: T.unsafe(nil)); end + sig { params(name: String, superclass_name: T.nilable(String), block: T.nilable(T.proc.params(scope: RBI::Scope).void)).void } def create_class(name, superclass_name: T.unsafe(nil), &block); end @@ -142,6 +149,9 @@ class RBI::Tree < ::RBI::NodeWithComments sig { params(name: String, value: String).void } def create_type_member(name, value: T.unsafe(nil)); end + sig { params(annotation: String).void } + def deannotate!(annotation); end + sig { returns(T::Boolean) } def empty?; end @@ -151,8 +161,8 @@ class RBI::Tree < ::RBI::NodeWithComments sig { returns(RBI::Index) } def index; end - sig { params(other: RBI::Tree).returns(RBI::Tree) } - def merge(other); end + sig { params(other: RBI::Tree, left_name: String, right_name: String, keep: RBI::Rewriters::Merge::Keep).returns(RBI::MergeTree) } + def merge(other, left_name: T.unsafe(nil), right_name: T.unsafe(nil), keep: T.unsafe(nil)); end sig { void } def nest_non_public_methods!; end