Merge pull request #2292 from ksss/rbs-style-instance-with-instance

Apply rubocop style to RBS

Author: soutaro

.rubocop.yml

@@ -46,12 +46,16 @@ RBS/Style:
     - 'test/**/*'
 RBS/Style/BlockReturnBoolish:
   Enabled: true
+RBS/Style/ClassWithSingleton:
+  Enabled: true
 RBS/Style/DuplicatedType:
   Enabled: true
 RBS/Style/EmptyArgument:
   Enabled: true
 RBS/Style/InitializeReturnType:
   Enabled: true
+RBS/Style/InstanceWithInstance:
+  Enabled: true
 RBS/Style/OptionalNil:
   Enabled: true
 RBS/Style/RedundantParentheses:

core/data.rbs

@@ -411,5 +411,5 @@ class Data
   #     out = origin.with(z: 1) # ArgumentError: unknown keyword: :z
   #     some_point = origin.with(1, 2) # ArgumentError: expected keyword arguments, got positional arguments
   #
-  def with: (**untyped) -> instance
+  def with: (**untyped) -> self
 end

core/exception.rbs

@@ -270,7 +270,7 @@ class Exception
   #     x0..equal?(x1)            # => false
   #
   def exception: (?self) -> self
-               | (string | _ToS message) -> instance
+               | (string | _ToS message) -> self
 
   # <!--
   #   rdoc-file=error.c

core/method.rbs

@@ -54,7 +54,7 @@ class Method
   #
   def hash: () -> Integer
 
-  def dup: () -> instance
+  def dup: () -> self
 
   # <!--
   #   rdoc-file=proc.c
@@ -252,7 +252,7 @@ class Method
   #     m.call # => "bar"
   #     n = m.clone.call # => "bar"
   #
-  def clone: () -> instance
+  def clone: () -> self
 
   # <!--
   #   rdoc-file=proc.c

core/module.rbs

@@ -731,8 +731,8 @@ class Module < Object
   #     I'm Dino!
   #     #<B:0x401b39e8>
   #
-  def define_method: (interned symbol, ^() [self: instance] -> untyped | Method | UnboundMethod method) -> Symbol
-                   | (interned symbol) { () [self: instance] -> untyped } -> Symbol
+  def define_method: (interned symbol, ^() [self: self] -> untyped | Method | UnboundMethod method) -> Symbol
+                   | (interned symbol) { () [self: self] -> untyped } -> Symbol
 
   # <!--
   #   rdoc-file=object.c

core/proc.rbs

@@ -376,8 +376,8 @@ class Proc
   #
   def self.new: () { (?) -> untyped } -> instance
 
-  def clone: () -> instance
-  def dup: () -> instance
+  def clone: () -> self
+  def dup: () -> self
 
   # <!-- rdoc-file=proc.c -->
   # Invokes the block, setting the block's parameters to the values in *params*

core/rubygems/version.rbs

@@ -221,7 +221,7 @@ module Gem
     #
     # Pre-release (alpha) parts, e.g, 5.3.1.b.2 => 5.4, are ignored.
     #
-    def bump: () -> instance
+    def bump: () -> self
 
     # <!--
     #   rdoc-file=lib/rubygems/version.rb
@@ -274,7 +274,7 @@ module Gem
     # The release for this version (e.g. 1.2.0.a -> 1.2.0). Non-prerelease versions
     # return themselves.
     #
-    def release: () -> instance
+    def release: () -> self
 
     # <!--
     #   rdoc-file=lib/rubygems/version.rb

core/string.rbs

@@ -1936,7 +1936,7 @@ class String
     ?crlf_newline: boolish,
     ?lf_newline: boolish,
     ?fallback: ^(String) -> string? | Method | _EncodeFallbackAref
-  ) -> instance
+  ) -> self
 
   interface _EncodeFallbackAref
     def []: (String) -> string?

core/unbound_method.rbs

@@ -100,7 +100,7 @@ class UnboundMethod
   #     m.call # => "bar"
   #     n = m.clone.call # => "bar"
   #
-  def clone: () -> instance
+  def clone: () -> self
 
   # <!--
   #   rdoc-file=proc.c