Small cleanups

Author: eregon

lib/truffle/io/wait.rb

@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2017, 2023 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
@@ -47,17 +49,15 @@ def wait_priority(timeout = nil)
   #
   # Optional parameter +mode+ is one of +:read+, +:write+, or
   # +:read_write+.
-  #
   def wait(*args)
     ensure_open
 
-    if args.size != 2 || args[0].is_a?(Symbol) || args[1].is_a?(Symbol)
+    if args.size != 2 || Primitive.object_kind_of?(args[0], Symbol) || Primitive.object_kind_of?(args[1], Symbol)
       # Slow/messy path:
-
       timeout = :undef
       events = 0
       args.each do |arg|
-        if arg.is_a?(Symbol)
+        if Primitive.object_kind_of?(arg, Symbol)
           events |= case arg
                     when :r, :read, :readable then IO::READABLE
                     when :w, :write, :writable then IO::WRITABLE
@@ -80,9 +80,8 @@ def wait(*args)
       res = Truffle::IOOperations.poll(self, events, timeout)
       res == 0 ? nil : self
     else
-      # argc == 2 and neither are symbols
+      # args.size == 2 and neither are symbols
       # This is the fast path and the new interface:
-
       events, timeout = *args
       raise ArgumentError, 'Events must be positive integer!' if events <= 0
       res = Truffle::IOOperations.poll(self, events, timeout)

src/main/ruby/truffleruby/core/truffle/io_operations.rb

@@ -206,7 +206,7 @@ def self.select(readables, readable_ios, writables, writable_ios, errorables, er
     end
 
     # This method will return an event mask if poll returned without error.
-    # The event mask is >0 when an event occured within the timeout, 0 if the timeout expired.
+    # The event mask is > 0 when an event occurred within the timeout, 0 if the timeout expired.
     # Raises an exception for an errno.
     def self.poll(io, event_mask, timeout)
       if (event_mask & POLLIN) != 0

test/mri/tests/io/wait/test_io_wait_uncommon.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'test/unit'
+require 'io/wait'
 
 # test uncommon device types to check portability problems
 # We may optimize IO#wait_*able for non-Linux kernels in the future
@@ -12,7 +13,7 @@ def test_tty_wait
   end
 
   def test_fifo_wait
-    omit 'no mkfifo' unless File.respond_to?(:mkfifo) && IO.const_defined?(:NONBLOCK)
+    skip 'no mkfifo' unless File.respond_to?(:mkfifo) && IO.const_defined?(:NONBLOCK)
     require 'tmpdir'
     Dir.mktmpdir('rubytest-fifo') do |dir|
       fifo = "#{dir}/fifo"