Merge pull request #6104 from ianks/rb-sys-0.9.46

Updates rb-sys to 0.9.46

.github/workflows/daily-rubygems.yml

@@ -31,9 +31,10 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler: none
 
-      - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
+      - uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
         with:
           toolchain: ${{ matrix.cargo }}
+          components: rustfmt
 
       - name: Show Ruby version
         run: ruby --version

.github/workflows/windows-rubygems.yml

@@ -40,10 +40,10 @@ jobs:
           ruby-version: ${{ matrix.ruby.value }}
           bundler: none
           mingw: clang
-      - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1.0.7
+      - uses: dtolnay/rust-toolchain@e645b0cf01249a964ec099494d38d2da0f0b349f
         with:
           toolchain: ${{ matrix.cargo.toolchain }}-${{ matrix.cargo.target }}
-          default: true
+          components: rustfmt
       - name: Print debugging info
         run: |
           echo "RbConfig::MAKEFILE_CONFIG"

lib/rubygems/ext/cargo_builder.rb

@@ -52,7 +52,7 @@ def cargo_command(cargo_dir, dest_path, args = [])
     cmd += ["--manifest-path", manifest]
     cmd += ["--lib"]
     cmd += ["--profile", profile.to_s]
-    cmd += ["--locked"] if profile == :release
+    cmd += ["--locked"]
     cmd += Gem::Command.build_args
     cmd += args
     cmd += ["--"]
@@ -75,7 +75,6 @@ def cargo_rustc_args(dest_dir)
       *rustc_dynamic_linker_flags(dest_dir),
       *rustc_lib_flags(dest_dir),
       *platform_specific_rustc_args(dest_dir),
-      *debug_flags,
     ]
   end
 
@@ -149,7 +148,7 @@ def cargo_dylib_path(dest_path)
     prefix = so_ext == "dll" ? "" : "lib"
     path_parts = [dest_path]
     path_parts << ENV["CARGO_BUILD_TARGET"] if ENV["CARGO_BUILD_TARGET"]
-    path_parts += [profile_target_directory, "#{prefix}#{cargo_crate_name}.#{so_ext}"]
+    path_parts += ["release", "#{prefix}#{cargo_crate_name}.#{so_ext}"]
     File.join(*path_parts)
   end
 
@@ -254,13 +253,6 @@ def makefile_config(var_name)
     RbConfig.expand(val.dup)
   end
 
-  # Good balance between binary size and debugability
-  def debug_flags
-    return [] if profile == :dev
-
-    ["-C", "debuginfo=1"]
-  end
-
   # Copied from ExtConfBuilder
   def finalize_directory(dest_path, lib_dir, extension_dir)
     require "fileutils"
@@ -299,14 +291,6 @@ def get_relative_path(path, base)
     path
   end
 
-  def profile_target_directory
-    case profile
-    when :release then "release"
-    when :dev     then "debug"
-    else          raise "unknown target directory for profile: #{profile}"
-    end
-  end
-
   # Error raised when no cdylib artifact was created
   class DylibNotFoundError < StandardError
     def initialize(dir)

test/rubygems/test_gem_ext_cargo_builder.rb

@@ -57,32 +57,8 @@ def test_build_cdylib
     output = output.join "\n"
     bundle = File.join(@dest_path, "release/rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
 
-    assert_match "Finished release [optimized] target(s)", output
-    assert_ffi_handle bundle, "Init_rust_ruby_example"
-  rescue Exception => e
-    pp output if output
-
-    raise(e)
-  end
-
-  def test_build_dev_profile
-    skip_unsupported_platforms!
-    setup_rust_gem "rust_ruby_example"
-
-    output = []
-
-    Dir.chdir @ext do
-      ENV.update(@rust_envs)
-      spec = Gem::Specification.new "rust_ruby_example", "0.1.0"
-      builder = Gem::Ext::CargoBuilder.new(spec)
-      builder.profile = :dev
-      builder.build nil, @dest_path, output
-    end
-
-    output = output.join "\n"
-    bundle = File.join(@dest_path, "debug/rust_ruby_example.#{RbConfig::CONFIG['DLEXT']}")
-
-    assert_match "Finished dev [unoptimized + debuginfo] target(s)", output
+    assert_match(/Finished/, output)
+    assert_match(/release/, output)
     assert_ffi_handle bundle, "Init_rust_ruby_example"
   rescue Exception => e
     pp output if output

test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 crate-type = ["cdylib"]
 
 [dependencies]
-rb-sys = "0.9.37"
+rb-sys = "0.9.46"