Apply ReplaceWithPrimitiveObjectClass to lib/truffle as well

Author: eregon

.rubocop.yml

@@ -401,24 +401,25 @@ Layout/SpaceAroundEqualsInParameterDefault:
 # Supports --auto-correct
 TruffleRuby/ReplaceWithPrimitiveNil:
   Enabled: true
-  Include: # inspect *only* this directory
+  Include: # inspect *only* these files
     - lib/truffle/**/*.rb
     - src/main/ruby/**/*.rb
 
 # Supports --auto-correct
 TruffleRuby/ReplaceWithPrimitiveObjectClass:
   Enabled: true
-  Include: # inspect *only* this directory
+  Include: # inspect *only* these files
+    - lib/truffle/**/*.rb
     - src/main/ruby/**/*.rb
 
 # Supports --auto-correct
 TruffleRuby/ReplaceWithPrimitiveObjectEqual:
   Enabled: true
-  Include: # inspect *only* this directory
+  Include: # inspect *only* these files
     - src/main/ruby/**/*.rb
 
 # Supports --auto-correct
 TruffleRuby/ReplaceWithPrimitiveObjectKindOf:
   Enabled: true
-  Include: # inspect *only* this directory
+  Include: # inspect *only* these files
     - src/main/ruby/**/*.rb

lib/truffle/digest.rb

@@ -83,16 +83,16 @@ def new
     end
 
     def block_length
-      raise RuntimeError, "#{self.class.name} does not implement block_length()"
+      raise RuntimeError, "#{Primitive.class(self).name} does not implement block_length()"
     end
 
     def update(message)
-      raise RuntimeError, "#{self.class.name} does not implement update()"
+      raise RuntimeError, "#{Primitive.class(self).name} does not implement update()"
     end
     alias_method :<<, :update
 
     def reset
-      raise RuntimeError, "#{self.class.name} does not implement reset()"
+      raise RuntimeError, "#{Primitive.class(self).name} does not implement reset()"
     end
 
     def digest(message = NO_MESSAGE)
@@ -150,7 +150,7 @@ def ==(other)
     end
 
     def inspect
-      "#<#{self.class.name}: #{hexdigest}>"
+      "#<#{Primitive.class(self).name}: #{hexdigest}>"
     end
   end
 

lib/truffle/socket/ancillary_data.rb

@@ -37,7 +37,7 @@ def self.int(family, level, type, integer)
     def self.unix_rights(*ios)
       descriptors = ios.map do |io|
         unless io.is_a?(IO)
-          raise TypeError, "IO expected, got #{io.class} instead"
+          raise TypeError, "IO expected, got #{Primitive.class(io)} instead"
         end
 
         io.fileno

lib/truffle/socket/option.rb

@@ -63,7 +63,7 @@ def unpack(template)
     end
 
     def inspect
-      "#<#{self.class}: #@family_name #@level_name #@opt_name #{@data.inspect}>"
+      "#<#{Primitive.class(self)}: #@family_name #@level_name #@opt_name #{@data.inspect}>"
     end
 
     def bool

lib/truffle/socket/socket.rb

@@ -307,7 +307,7 @@ class << self
   end
 
   def initialize(family, socket_type, protocol = 0)
-    @no_reverse_lookup = self.class.do_not_reverse_lookup
+    @no_reverse_lookup = Primitive.class(self).do_not_reverse_lookup
 
     @family = Truffle::Socket.protocol_family(family)
     socket_type = Truffle::Socket.socket_type(socket_type)

lib/truffle/socket/tcp_server.rb

@@ -28,7 +28,7 @@
 
 class TCPServer < TCPSocket
   def initialize(host = nil, service)
-    @no_reverse_lookup = self.class.do_not_reverse_lookup
+    @no_reverse_lookup = Primitive.class(self).do_not_reverse_lookup
 
     remote_addrs = Socket
       .getaddrinfo(host, service, :UNSPEC, :STREAM, 0, Socket::AI_PASSIVE)

lib/truffle/socket/tcp_socket.rb

@@ -44,7 +44,7 @@ def self.gethostbyname(hostname)
   end
 
   def initialize(host, service, local_host = nil, local_service = nil)
-    @no_reverse_lookup = self.class.do_not_reverse_lookup
+    @no_reverse_lookup = Primitive.class(self).do_not_reverse_lookup
 
     if host
       host = Truffle::Socket.coerce_to_string(host)

lib/truffle/socket/truffle.rb

@@ -375,7 +375,7 @@ def self.shutdown_option(how)
           shutdown_option(coerce_to_string(how))
         else
           raise TypeError,
-            "no implicit conversion of #{how.class} into Integer"
+            "no implicit conversion of #{Primitive.class(how)} into Integer"
         end
       end
     end

lib/truffle/socket/truffle/ancillary_data.rb

@@ -75,7 +75,7 @@ def self.type(family, level, raw_type)
             end
           else
             raise TypeError,
-              "no implicit conversion of #{type.class} into Integer"
+              "no implicit conversion of #{Primitive.class(type)} into Integer"
           end
         end
       end

lib/truffle/socket/truffle/foreign/ifaddrs.rb

@@ -96,7 +96,7 @@ def each_address
           next_pointer = self.next
 
           until next_pointer.null?
-            struct = self.class.new(next_pointer)
+            struct = Primitive.class(self).new(next_pointer)
 
             yield struct