[pull] master from ruby:master

doc/string/bytes.rdoc

@@ -4,4 +4,4 @@ Returns an array of the bytes in +self+:
   'こんにちは'.bytes
   # => [227, 129, 147, 227, 130, 147, 227, 129, 171, 227, 129, 161, 227, 129, 175]
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/chars.rdoc

@@ -4,4 +4,4 @@ Returns an array of the characters in +self+:
   'こんにちは'.chars # => ["こ", "ん", "に", "ち", "は"]
   ''.chars          # => []
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/codepoints.rdoc

@@ -5,4 +5,4 @@ each codepoint is the integer value for a character:
   'こんにちは'.codepoints # => [12371, 12435, 12395, 12385, 12399]
   ''.codepoints          # => []
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/getbyte.rdoc

@@ -20,4 +20,4 @@ More examples:
   s.bytes      # => [227, 129, 147, 227, 130, 147, 227, 129, 171, 227, 129, 161, 227, 129, 175]
   s.getbyte(2) # => 147
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/grapheme_clusters.rdoc

@@ -16,4 +16,4 @@ Details:
   s.chars                         # => ["a", "̈"]       # Two characters.
   s.chars.map {|char| char.ord }  # => [97, 776]       # Their values.
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/inspect.rdoc

@@ -35,4 +35,4 @@ A few, however, have special renderings:
   13.chr.inspect # => "\"\\r\""  # CR
   27.chr.inspect # => "\"\\e\""  # ESC
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/intern.rdoc

@@ -4,5 +4,5 @@ creating it if it did not already exist:
   'foo'.intern       # => :foo
   'こんにちは'.intern # => :こんにちは
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].
 

doc/string/ord.rdoc

@@ -4,4 +4,4 @@ Returns the integer ordinal of the first character of +self+:
   'hello'.ord     # => 104
   'こんにちは'.ord  # => 12371
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/partition.rdoc

@@ -40,4 +40,4 @@ then performs the equivalent of <tt>self.index(pattern)</tt>
   'hello'.partition('x')     # => ["hello", "", ""]
   'こんにちは'.partition('に') # => ["こん", "に", "ちは"]
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/rpartition.rdoc

@@ -44,4 +44,4 @@ then searches for the last matching substring
   'hello'.rpartition('')      # => ["hello", "", ""]
   'こんにちは'.rpartition('に') # => ["こん", "に", "ちは"]
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/scan.rdoc

@@ -32,4 +32,4 @@ With a block given, calls the block with each result; returns +self+:
   # => ["w", "o"]
   # => ["r", "l"]
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/string/split.rdoc

@@ -98,4 +98,4 @@ But the latter:
 - Has poorer performance because it creates an intermediate array.
 - Returns an array (instead of +self+).
 
-Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non--5CString].
+Related: see {Converting to Non-String}[rdoc-ref:String@Converting+to+Non-String].

doc/stringio/stringio.md

@@ -690,11 +690,11 @@ Reading:
 
 [basic reading]:         rdoc-ref:StringIO@Basic+Reading
 [basic writing]:         rdoc-ref:StringIO@Basic+Writing
-[bom (byte order mark)]: rdoc-ref:StringIO@BOM+-28Byte+Order+Mark-29
+[bom (byte order mark)]: rdoc-ref:StringIO@BOM+Byte+Order+Mark
 [data mode]:             rdoc-ref:StringIO@Data+Mode
 [encodings]:             rdoc-ref:StringIO@Encodings
 [end-of-stream]:         rdoc-ref:StringIO@End-of-Stream
 [line number]:           rdoc-ref:StringIO@Line+Number
-[open/closed streams]:   rdoc-ref:StringIO@Open-2FClosed+Streams
+[open/closed streams]:   rdoc-ref:StringIO@OpenClosed+Streams
 [position]:              rdoc-ref:StringIO@Position
-[read/write mode]:       rdoc-ref:StringIO@Read-2FWrite+Mode
+[read/write mode]:       rdoc-ref:StringIO@ReadWrite+Mode

doc/strscan/link_refs.txt

@@ -1,5 +1,5 @@
 [1]: rdoc-ref:StringScanner@Stored+String
-[2]: rdoc-ref:StringScanner@Byte+Position+-28Position-29
+[2]: rdoc-ref:StringScanner@Byte+Position+Position
 [3]: rdoc-ref:StringScanner@Target+Substring
 [4]: rdoc-ref:StringScanner@Setting+the+Target+Substring
 [5]: rdoc-ref:StringScanner@Traversing+the+Target+Substring

gc.c

@@ -3633,9 +3633,11 @@ rb_gc_register_address(VALUE *addr)
     VALUE obj = *addr;
 
     struct global_object_list *tmp = ALLOC(struct global_object_list);
-    tmp->next = vm->global_object_list;
-    tmp->varptr = addr;
-    vm->global_object_list = tmp;
+    RB_VM_LOCKING() {
+        tmp->next = vm->global_object_list;
+        tmp->varptr = addr;
+        vm->global_object_list = tmp;
+    }
 
     /*
      * Because some C extensions have assignment-then-register bugs,
@@ -3653,22 +3655,25 @@ void
 rb_gc_unregister_address(VALUE *addr)
 {
     rb_vm_t *vm = GET_VM();
-    struct global_object_list *tmp = vm->global_object_list;
-
-    if (tmp->varptr == addr) {
-        vm->global_object_list = tmp->next;
-        SIZED_FREE(tmp);
-        return;
-    }
-    while (tmp->next) {
-        if (tmp->next->varptr == addr) {
-            struct global_object_list *t = tmp->next;
+    struct global_object_list *tmp;
+    RB_VM_LOCKING() {
+        tmp = vm->global_object_list;
+        if (tmp->varptr == addr) {
+            vm->global_object_list = tmp->next;
+            SIZED_FREE(tmp);
+        }
+        else {
+            while (tmp->next) {
+                if (tmp->next->varptr == addr) {
+                    struct global_object_list *t = tmp->next;
 
-            tmp->next = tmp->next->next;
-            SIZED_FREE(t);
-            break;
+                    tmp->next = tmp->next->next;
+                    SIZED_FREE(t);
+                    break;
+                }
+                tmp = tmp->next;
+            }
         }
-        tmp = tmp->next;
     }
 }
 

internal/imemo.h

@@ -57,7 +57,6 @@ struct vm_svar {
 /*! THROW_DATA */
 struct vm_throw_data {
     VALUE flags;
-    VALUE reserved;
     const VALUE throw_obj;
     const struct rb_control_frame_struct *catch_frame;
     int throw_state;

lib/error_highlight/base.rb

@@ -28,7 +28,7 @@ module ErrorHighlight
   # Currently, ErrorHighlight.spot only supports a single-line code fragment.
   # Therefore, if the return value is not nil, first_lineno and last_lineno will have
   # the same value. If the relevant code fragment spans multiple lines
-  # (e.g., Array#[] of +ary[(newline)expr(newline)]+), the method will return nil.
+  # (e.g., Array#[] of <tt>ary[(newline)expr(newline)]</tt>), the method will return nil.
   # This restriction may be removed in the future.
   def self.spot(obj, **opts)
     case obj

lib/net/http.rb

@@ -37,7 +37,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   # For information about \HTTP, see:
   #
   # - {Hypertext Transfer Protocol}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol].
-  # - {Technical overview}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Technical_overview].
+  # - {Technology}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Technology].
   #
   # == About the Examples
   #
@@ -72,7 +72,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #
   # - If performance is important, consider using sessions, which lower request overhead.
   #   This {session}[rdoc-ref:Net::HTTP@Sessions] has multiple requests for
-  #   {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods]
+  #   {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Method]
   #   and {WebDAV methods}[https://en.wikipedia.org/wiki/WebDAV#Implementation]:
   #
   #     Net::HTTP.start(hostname) do |http|
@@ -198,7 +198,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   # In the block, you can use these instance methods,
   # each of which that sends a single request:
   #
-  # - {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods]:
+  # - {HTTP methods}[https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Method]:
   #
   #   - #get, #request_get: GET.
   #   - #head, #request_head: HEAD.
@@ -447,7 +447,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   # if the response has header <tt>'Content-Range'</tt>.
   #
   # Otherwise decompression (or not) depends on the value of header
-  # {Content-Encoding}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#content-encoding-response-header]:
+  # {Content-Encoding}[https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Content-Encoding_2]:
   #
   # - <tt>'deflate'</tt>, <tt>'gzip'</tt>, or <tt>'x-gzip'</tt>:
   #   decompresses the body and deletes the header.

lib/prism.rb

@@ -56,18 +56,18 @@ def initialize(version)
   end
 
   # :call-seq:
-  #   Prism::lex_compat(source, **options) -> LexCompat::Result
+  #   lex_compat(source, **options) -> LexCompat::Result
   #
   # Returns a parse result whose value is an array of tokens that closely
-  # resembles the return value of Ripper::lex.
+  # resembles the return value of Ripper.lex.
   #
-  # For supported options, see Prism::parse.
+  # For supported options, see Prism.parse.
   def self.lex_compat(source, **options)
     LexCompat.new(source, **options).result # steep:ignore
   end
 
   # :call-seq:
-  #   Prism::load(source, serialized, freeze) -> ParseResult
+  #   load(source, serialized, freeze) -> ParseResult
   #
   # Load the serialized AST using the source as a reference into a tree.
   def self.load(source, serialized, freeze = false)

lib/prism/desugar_compiler.rb

@@ -254,137 +254,137 @@ def desugar # :nodoc:
   # DesugarCompiler is a compiler that desugars Ruby code into a more primitive
   # form. This is useful for consumers that want to deal with fewer node types.
   class DesugarCompiler < MutationCompiler
-    # @@foo &&= bar
+    # `@@foo &&= bar`
     #
     # becomes
     #
-    # @@foo && @@foo = bar
+    # `@@foo && @@foo = bar`
     def visit_class_variable_and_write_node(node)
       node.desugar
     end
 
-    # @@foo ||= bar
+    # `@@foo ||= bar`
     #
     # becomes
     #
-    # defined?(@@foo) ? @@foo : @@foo = bar
+    # `defined?(@@foo) ? @@foo : @@foo = bar`
     def visit_class_variable_or_write_node(node)
       node.desugar
     end
 
-    # @@foo += bar
+    # `@@foo += bar`
     #
     # becomes
     #
-    # @@foo = @@foo + bar
+    # `@@foo = @@foo + bar`
     def visit_class_variable_operator_write_node(node)
       node.desugar
     end
 
-    # Foo &&= bar
+    # `Foo &&= bar`
     #
     # becomes
     #
-    # Foo && Foo = bar
+    # `Foo && Foo = bar`
     def visit_constant_and_write_node(node)
       node.desugar
     end
 
-    # Foo ||= bar
+    # `Foo ||= bar`
     #
     # becomes
     #
-    # defined?(Foo) ? Foo : Foo = bar
+    # `defined?(Foo) ? Foo : Foo = bar`
     def visit_constant_or_write_node(node)
       node.desugar
     end
 
-    # Foo += bar
+    # `Foo += bar`
     #
     # becomes
     #
-    # Foo = Foo + bar
+    # `Foo = Foo + bar`
     def visit_constant_operator_write_node(node)
       node.desugar
     end
 
-    # $foo &&= bar
+    # `$foo &&= bar`
     #
     # becomes
     #
-    # $foo && $foo = bar
+    # `$foo && $foo = bar`
     def visit_global_variable_and_write_node(node)
       node.desugar
     end
 
-    # $foo ||= bar
+    # `$foo ||= bar`
     #
     # becomes
     #
-    # defined?($foo) ? $foo : $foo = bar
+    # `defined?($foo) ? $foo : $foo = bar`
     def visit_global_variable_or_write_node(node)
       node.desugar
     end
 
-    # $foo += bar
+    # `$foo += bar`
     #
     # becomes
     #
-    # $foo = $foo + bar
+    # `$foo = $foo + bar`
     def visit_global_variable_operator_write_node(node)
       node.desugar
     end
 
-    # @foo &&= bar
+    # `@foo &&= bar`
     #
     # becomes
     #
-    # @foo && @foo = bar
+    # `@foo && @foo = bar`
     def visit_instance_variable_and_write_node(node)
       node.desugar
     end
 
-    # @foo ||= bar
+    # `@foo ||= bar`
     #
     # becomes
     #
-    # @foo || @foo = bar
+    # `@foo || @foo = bar`
     def visit_instance_variable_or_write_node(node)
       node.desugar
     end
 
-    # @foo += bar
+    # `@foo += bar`
     #
     # becomes
     #
-    # @foo = @foo + bar
+    # `@foo = @foo + bar`
     def visit_instance_variable_operator_write_node(node)
       node.desugar
     end
 
-    # foo &&= bar
+    # `foo &&= bar`
     #
     # becomes
     #
-    # foo && foo = bar
+    # `foo && foo = bar`
     def visit_local_variable_and_write_node(node)
       node.desugar
     end
 
-    # foo ||= bar
+    # `foo ||= bar`
     #
     # becomes
     #
-    # foo || foo = bar
+    # `foo || foo = bar`
     def visit_local_variable_or_write_node(node)
       node.desugar
     end
 
-    # foo += bar
+    # `foo += bar`
     #
     # becomes
     #
-    # foo = foo + bar
+    # `foo = foo + bar`
     def visit_local_variable_operator_write_node(node)
       node.desugar
     end