Merge pull request #1151 from ruby/fix-getaddrinfo

Let `peer`/`nodename` be `nil` if `protocol`/`service` is not

Author: soutaro

stdlib/socket/0/addrinfo.rbs

@@ -57,7 +57,8 @@ class Addrinfo
   #     #=> [#<Addrinfo: 203.178.141.194:80 TCP (www.kame.net)>,
   #     #    #<Addrinfo: [2001:200:dff:fff1:216:3eff:feb1:44d7]:80 TCP (www.kame.net)>]
   #
-  def self.getaddrinfo: (String nodename, ?String | Integer service, ?Symbol? family, ?Symbol | Integer protocol) -> Array[Addrinfo]
+  def self.getaddrinfo: (String nodename, ?String | Integer | nil service, ?Symbol? family, ?Symbol | Integer protocol) -> Array[Addrinfo]
+                      | (String? nodename, ?String | Integer service, ?Symbol? family, ?Symbol | Integer protocol) -> Array[Addrinfo]
 
   # <!--
   #   rdoc-file=ext/socket/raddrinfo.c

stdlib/socket/0/socket.rbs

@@ -165,6 +165,7 @@ class Socket < BasicSocket
   # If Addrinfo object is preferred, use Addrinfo.getaddrinfo.
   #
   def self.getaddrinfo: (String peer, String | Integer | nil protocol, ?Integer | Symbol | nil family, ?Integer | Symbol | nil socktype, ?Integer | Symbol | nil protocol, ?Integer | nil flags) -> [ String, Integer, String, String, Integer, Integer, Integer ]
+                      | (String? peer, String | Integer protocol, ?Integer | Symbol | nil family, ?Integer | Symbol | nil socktype, ?Integer | Symbol | nil protocol, ?Integer | nil flags) -> [ String, Integer, String, String, Integer, Integer, Integer ]
 
   # <!--
   #   rdoc-file=ext/socket/socket.c