ruby-changes:72357
From: Ian <ko1@a...>
Date: Wed, 29 Jun 2022 09:53:31 +0900 (JST)
Subject: [ruby-changes:72357] 50e576292b (master): [rubygems/rubygems] Upgrade rb-sys to 0.9.14
https://git.ruby-lang.org/ruby.git/commit/?id=50e576292b From 50e576292b26010470f55e6cc89a0cec680f92d1 Mon Sep 17 00:00:00 2001 From: Ian Ker-Seymer <i.kerseymer@g...> Date: Tue, 28 Jun 2022 17:33:45 -0400 Subject: [rubygems/rubygems] Upgrade rb-sys to 0.9.14 https://github.com/rubygems/rubygems/commit/c9adf3ef1c --- .../custom_name/Cargo.lock | 183 +++------------------ .../custom_name/Cargo.toml | 3 +- .../custom_name/src/lib.rs | 3 - .../rust_ruby_example/Cargo.lock | 183 +++------------------ .../rust_ruby_example/Cargo.toml | 3 +- .../rust_ruby_example/src/lib.rs | 3 - 6 files changed, 44 insertions(+), 334 deletions(-) diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock index cb1bdb3c61..e832356482 100644 --- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock +++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock @@ -11,47 +11,23 @@ dependencies = [ https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L11 "memchr", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr", "clang-sys", - "clap", - "env_logger", "lazy_static", "lazycell", - "log", "peeking_take_while", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "which", ] [[package]] @@ -60,12 +36,6 @@ version = "1.3.2" https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L36 source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" - [[package]] name = "cexpr" version = "0.6.0" @@ -92,21 +62,6 @@ dependencies = [ https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L62 "libloading", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - [[package]] name = "custom-name-ext" version = "0.1.0" @@ -114,46 +69,12 @@ dependencies = [ https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L69 "rb-sys", ] -[[package]] -name = "either" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" - -[[package]] -name = "env_logger" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - [[package]] name = "lazy_static" version = "1.4.0" @@ -191,15 +112,6 @@ dependencies = [ https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L112 "memchr", ] -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - [[package]] name = "memchr" version = "2.5.0" @@ -228,41 +140,42 @@ version = "0.1.2" https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L140 source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "rb-sys" -version = "0.9.4" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5465c5bd695ef70959b91b4ca9cfd515e9af012f6d9f0ae46f09fa4bcc3b722" +checksum = "4bafde3b253968a803e8ebdef607ff6e259fb4a74a55135f65095df42c629eba" dependencies = [ "bindgen", - "cc", - "lazy_static", "linkify", - "pkg-config", + "rb-sys-build", +] + +[[package]] +name = "rb-sys-build" +version = "0.9.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d871cc097786d39ab6196fe51fb66d54933e2a6cc7e86373f398ee794d0b22" +dependencies = [ + "regex", "shell-words", ] @@ -301,58 +214,11 @@ version = "1.1.0" https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L214 source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "unicode-ident" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "which" -version = "4.2.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" -dependencies = [ - "either", - "lazy_static", - "libc", -] +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" [[package]] name = "winapi" @@ -370,15 +236,6 @@ version = "0.4.0" https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock#L236 source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml index cbc9225140..708ba14b6d 100644 --- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml +++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml @@ -1,9 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml#L1 [package] name = "custom-name-ext" version = "0.1.0" +edition = "2021" [lib] crate-type = ["cdylib"] [dependenc (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/