Make some changes suggested by Fasterer

Author: chrisseaton

lib/truffle/date.rb

@@ -258,8 +258,7 @@ class Infinity < Numeric # :nodoc:
 
     def initialize(d=1) @d = d <=> 0 end
 
-    def d() @d end
-
+    attr_reader :d
     protected :d
 
     def zero? () false end
@@ -1144,7 +1143,7 @@ def initialize(ajd=0, of=0, sg=ITALY)
   end
 
   # Get the date as an Astronomical Julian Day Number.
-  def ajd() @ajd end
+  attr_reader :ajd
 
   # Get the date as an Astronomical Modified Julian Day Number.
   def amjd() ajd_to_amjd(@ajd) end

lib/truffle/date/delta.rb

@@ -187,7 +187,7 @@ def self.diff(d1, d2) new(d1.ajd - d2.ajd) end
     class << self
 
       def once(*ids) # :nodoc: -- restricted
-        for id in ids
+        ids.each do |id|
           module_eval <<-"end;"
             alias_method :__#{id.object_id}__, :#{id}
             private :__#{id.object_id}__
@@ -206,8 +206,7 @@ def dhms() self.class.delta_to_dhms(@delta) end
 
     once :dhms
 
-    def delta() @delta end
-
+    attr_reader :delta
     protected :delta
 
     def years() dhms[0] end

lib/truffle/rbconfig-for-mkmf.rb

@@ -109,5 +109,5 @@
 mkconfig['TRY_LINK'] = "#{cc} -o conftest $(INCFLAGS) $(CPPFLAGS) #{cflags_for_try_link} #{cext_dir}/ruby.o #{cext_dir}/sulongmock.o $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
 
 %w[COMPILE_C COMPILE_CXX TRY_LINK].each do |key|
-  expanded[key] = mkconfig[key].gsub(/\$\((\w+)\)/) { expanded.fetch($1, $&) }
+  expanded[key] = mkconfig[key].gsub(/\$\((\w+)\)/) { expanded.fetch($1) { $& } }
 end

lib/truffle/rubygems/extra_executables_installer.rb

@@ -18,11 +18,11 @@ def remove_hooks(install_hook, uninstall_hook)
 
     private
 
-    def with_bin_dir(obj, new_bin_dir, &block)
+    def with_bin_dir(obj, new_bin_dir)
       old_bin_dir = obj.instance_variable_get :@bin_dir
       obj.instance_variable_set :@bin_dir, new_bin_dir
       begin
-        block.call
+        yield
       ensure
         obj.instance_variable_set :@bin_dir, old_bin_dir
       end

lib/truffle/truffle/cext.rb

@@ -913,7 +913,7 @@ def rb_str_encode(str, to, ecflags, ecopts)
 
     # TODO BJF 8-Mar-2017 Handle more ecflags
     if ecflags & Encoding::Converter::INVALID_REPLACE != 0
-      opts.merge!({:invalid => :replace})
+      opts[:invalid] = :replace
     end
 
     if opts.empty?