Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gem "json-schema"
gem "goodcheck"
gem 'digest'
gem 'tempfile'
gem "rdoc"
gem "rdoc", "~> 6.16"
gem "fileutils"
gem "raap"
gem "activesupport", "~> 7.0"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rdoc (6.15.1)
rdoc (6.16.0)
erb
psych (>= 4.0.0)
tsort
Expand Down Expand Up @@ -217,7 +217,7 @@ DEPENDENCIES
rake-compiler
rbs!
rbs-amber!
rdoc
rdoc (~> 6.16)
rspec
rubocop
rubocop-on-rbs
Expand Down
22 changes: 9 additions & 13 deletions core/thread.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -367,20 +367,16 @@ class Thread < Object
# - Thread.new { ... } -> thread
# - Thread.new(*args, &proc) -> thread
# - Thread.new(*args) { |args| ... } -> thread
# - Creates a new thread executing the given block.
# - Any +args+ given to ::new will be passed to the block:
# - arr = []
# - a, b, c = 1, 2, 3
# - Thread.new(a,b,c) { |d,e,f| arr << d << e << f }.join
# - arr #=> [1, 2, 3]
# - A ThreadError exception is raised if ::new is called without a block.
# - If you're going to subclass Thread, be sure to call super in your
# - +initialize+ method, otherwise a ThreadError will be raised.
# -->
# Creates a new thread executing the given block.
#
# Any `args` given to ::new will be passed to the block:
#
# arr = []
# a, b, c = 1, 2, 3
# Thread.new(a,b,c) { |d,e,f| arr << d << e << f }.join
# arr #=> [1, 2, 3]
#
# A ThreadError exception is raised if ::new is called without a block.
#
# If you're going to subclass Thread, be sure to call super in your `initialize`
# method, otherwise a ThreadError will be raised.
#
def initialize: (*untyped) { (?) -> void } -> void

Expand Down
2 changes: 1 addition & 1 deletion lib/rdoc/discover.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

begin
gem 'rdoc', '~> 6.13'
gem 'rdoc', '~> 6.16'
require 'rdoc_plugin/parser'
module RDoc
class Parser
Expand Down
2 changes: 1 addition & 1 deletion lib/rdoc_plugin/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def parse_method_decl(decl:, context:, outer_name: nil)
method.visibility = decl.visibility
method.call_seq = decl.overloads.map {|overload| "#{decl.name.to_s}#{overload.method_type.to_s}" }.join("\n")
if loc = decl.location
method.start_collecting_tokens
method.start_collecting_tokens(:ruby)
method.add_token({ line_no: 1, char_no: 1, kind: :on_comment, text: "# File #{@top_level.relative_name}, line(s) #{loc.start_line}:#{loc.end_line}\n" })
method.add_token({ line_no: 1, char_no: 1, text: loc.source })
method.line = loc.start_line
Expand Down
20 changes: 0 additions & 20 deletions stdlib/openssl/0/openssl.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -9524,49 +9524,29 @@ module OpenSSL
# of both is present, a TimestampError will be raised when trying to create a
# Response.
#
# call-seq:
# factory.default_policy_id = "string" -> string
# factory.default_policy_id -> string or nil
#
# ### serial_number
#
# Sets or retrieves the serial number to be used for timestamp creation. Must be
# present for timestamp creation.
#
# call-seq:
# factory.serial_number = number -> number
# factory.serial_number -> number or nil
#
# ### gen_time
#
# Sets or retrieves the Time value to be used in the Response. Must be present
# for timestamp creation.
#
# call-seq:
# factory.gen_time = Time -> Time
# factory.gen_time -> Time or nil
#
# ### additional_certs
#
# Sets or retrieves additional certificates apart from the timestamp certificate
# (e.g. intermediate certificates) to be added to the Response. Must be an Array
# of OpenSSL::X509::Certificate.
#
# call-seq:
# factory.additional_certs = [cert1, cert2] -> [ cert1, cert2 ]
# factory.additional_certs -> array or nil
#
# ### allowed_digests
#
# Sets or retrieves the digest algorithms that the factory is allowed create
# timestamps for. Known vulnerable or weak algorithms should not be allowed
# where possible. Must be an Array of String or OpenSSL::Digest subclass
# instances.
#
# call-seq:
# factory.allowed_digests = ["sha1", OpenSSL::Digest.new('SHA256').new] -> [ "sha1", OpenSSL::Digest) ]
# factory.allowed_digests -> array or nil
#
class Factory
def additional_certs: () -> Array[X509::Certificate]?

Expand Down
2 changes: 1 addition & 1 deletion stdlib/rdoc/0/rdoc.rbs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module RDoc
# -->
# Starts collecting tokens
#
def collect_tokens: () -> void
def collect_tokens: (Symbol) -> void

# <!--
# rdoc-file=lib/rdoc/token_stream.rb
Expand Down