Merge pull request #2328 from ruby/update-steep

Update steep

Author: soutaro

core/kernel.rbs

@@ -1729,7 +1729,7 @@ module Kernel : BasicObject
   def self?.sleep: (?nil) -> bot
                  | (Time::_Timeout duration) -> Integer
 
-  %a{steep:deprecated}
+  %a{deprecated}
   interface _Divmod
     def divmod: (Numeric) -> [ Numeric, Numeric ]
   end

core/module.rbs

@@ -1699,6 +1699,6 @@ class Module < Object
   def attr: (*interned arg0) -> Array[Symbol]
 
   # A previous incarnation of `interned` for backward-compatibility (see #1499)
-  %a{steep:deprecated}
+  %a{deprecated: Use `interned`}
   type id = interned
 end

core/object.rbs

@@ -106,5 +106,5 @@ class Object < BasicObject
 end
 
 # A previous incarnation of `interned` for backward-compatibility (see #1499)
-%a{steep:deprecated}
+%a{deprecated: Use `interned` instead}
 type Object::name = interned

core/string.rbs

@@ -3574,10 +3574,10 @@ class String
   def valid_encoding?: () -> bool
 end
 
-%a{steep:deprecated}
+%a{deprecated}
 interface _ArefFromStringToString
   def []: (String) -> String
 end
 
-%a{steep:deprecated}
+%a{deprecated}
 type String::encode_fallback = Hash[String, String] | Proc | Method | _ArefFromStringToString

lib/rbs/ast/type_param.rb

@@ -56,16 +56,6 @@ def to_json(state = JSON::State.new)
         }.to_json(state)
       end
 
-      def rename(name)
-        TypeParam.new(
-          name: name,
-          variance: variance,
-          upper_bound: upper_bound_type,
-          location: location,
-          default_type: default_type
-        ).unchecked!(unchecked?)
-      end
-
       def map_type(&block)
         if b = upper_bound_type
           _upper_bound_type = yield(b)

lib/rbs/prototype/rb.rb

@@ -382,7 +382,8 @@ def process(node, decls:, comments:, context:)
             name: const_name,
             type: type,
             location: nil,
-            comment: comments[node.first_lineno - 1]
+            comment: comments[node.first_lineno - 1],
+            annotations: []
           )
 
         when :IASGN

lib/rbs/prototype/rbi.rb

@@ -257,7 +257,8 @@ def process(node, outer: [], comments:)
               name: name,
               type: type,
               location: nil,
-              comment: nil
+              comment: nil,
+              annotations: []
             )
           end
         when :ALIAS

lib/rbs/prototype/runtime.rb

@@ -250,6 +250,8 @@ def merge_rbs(module_name, members, instance: nil, singleton: nil)
               method = builder.build_singleton(module_name.absolute!).methods[singleton]
               method_name = singleton
               kind = :singleton
+            else
+              raise
             end
 
             if method
@@ -462,6 +464,7 @@ def generate_constants(mod, decls)
             name: to_type_name(name.to_s),
             type: type,
             location: nil,
+            annotations: [],
             comment: nil
           )
         end

lib/rbs/types.rb

@@ -109,18 +109,14 @@ class Void < Base; end
       class Any < Base
         def initialize(location:, todo: false)
           super(location: location)
-          todo! if todo
+          if todo
+            @string = "__todo__"
+          end
         end
 
         def to_s(level=0)
           @string || "untyped"
         end
-
-        # @deprecated: this method is now called from the constructor, do not call it from outside
-        def todo!
-          @string = '__todo__'
-          self
-        end
       end
       class Nil < Base; end
       class Top < Base; end

lib/rbs/unit_test/with_aliases.rb

@@ -127,7 +127,9 @@ def with_range(start, stop, exclude_end = false)
 
             # `Range` requires `begin <=> end` to return non-nil, but doesn't actually
             # end up using the return value of it. This is to add that in when needed.
-            def lower.<=>(rhs) = :not_nil unless defined? lower.<=>
+            unless defined? lower.<=>
+              def lower.<=>(rhs) = :not_nil # steep:ignore MethodDefinitionInUndeclaredModule
+            end
 
             # If `lower <=> rhs` is defined but nil, then that means we're going to be constructing
             # an illegal range (eg `3..ToInt.new(4)`). So, we need to skip yielding an invalid range