From 6090d9792809354bd07a02c46765b6ad352f22f8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sun, 5 Jun 2022 20:16:20 +0000 Subject: [PATCH 1/4] Update Rust crate bindgen to 0.60 --- mgba-test-runner/Cargo.lock | 77 ++++++++++++++++++++----------------- mgba-test-runner/Cargo.toml | 2 +- 2 files changed, 43 insertions(+), 36 deletions(-) diff --git a/mgba-test-runner/Cargo.lock b/mgba-test-runner/Cargo.lock index 97edd61..f2b7a83 100644 --- a/mgba-test-runner/Cargo.lock +++ b/mgba-test-runner/Cargo.lock @@ -23,15 +23,6 @@ dependencies = [ "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 = "anyhow" version = "1.0.57" @@ -57,9 +48,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.59.2" +version = "0.60.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "2c0310d795615ac3541fa6312cf5b26b520852118e66165fcd23af4d544dc90a" dependencies = [ "bitflags", "cexpr", @@ -133,17 +124,26 @@ dependencies = [ [[package]] name = "clap" -version = "2.34.0" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ - "ansi_term", "atty", "bitflags", + "clap_lex", + "indexmap", "strsim", + "termcolor", "textwrap", - "unicode-width", - "vec_map", +] + +[[package]] +name = "clap_lex" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +dependencies = [ + "os_str_bytes", ] [[package]] @@ -195,6 +195,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -225,6 +231,16 @@ dependencies = [ "png", ] +[[package]] +name = "indexmap" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +dependencies = [ + "autocfg", + "hashbrown", +] + [[package]] name = "jobserver" version = "0.1.24" @@ -354,6 +370,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "os_str_bytes" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -421,9 +443,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "strsim" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "termcolor" @@ -436,12 +458,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "unicode-ident" @@ -449,18 +468,6 @@ 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" diff --git a/mgba-test-runner/Cargo.toml b/mgba-test-runner/Cargo.toml index dc77f24..529f680 100644 --- a/mgba-test-runner/Cargo.toml +++ b/mgba-test-runner/Cargo.toml @@ -16,4 +16,4 @@ image = { version = "0.24", default-features = false, features = [ "png", "bmp" [build-dependencies] cc = { version = "1", features = ["parallel"] } -bindgen = "0.59" \ No newline at end of file +bindgen = "0.60" \ No newline at end of file From 8df97c8ce8a5d77b1196b50655f89a59f01fa79f Mon Sep 17 00:00:00 2001 From: GBA bot Date: Sun, 5 Jun 2022 20:17:42 +0000 Subject: [PATCH 2/4] Update lockfiles --- book/games/pong/Cargo.lock | 8 ++++---- examples/the-hat-chooses-the-wizard/Cargo.lock | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/book/games/pong/Cargo.lock b/book/games/pong/Cargo.lock index 74ddc41..d63b6bc 100644 --- a/book/games/pong/Cargo.lock +++ b/book/games/pong/Cargo.lock @@ -393,9 +393,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", @@ -413,9 +413,9 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" +checksum = "42d4b50cba812f0f04f0707bb6a0eaa5fae4ae05d90fc2a377998d2f21e77a1c" [[package]] name = "unicode-ident" diff --git a/examples/the-hat-chooses-the-wizard/Cargo.lock b/examples/the-hat-chooses-the-wizard/Cargo.lock index 529d92d..cbed70f 100644 --- a/examples/the-hat-chooses-the-wizard/Cargo.lock +++ b/examples/the-hat-chooses-the-wizard/Cargo.lock @@ -409,9 +409,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" dependencies = [ "proc-macro2", "quote", @@ -438,9 +438,9 @@ dependencies = [ [[package]] name = "ttf-parser" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" +checksum = "42d4b50cba812f0f04f0707bb6a0eaa5fae4ae05d90fc2a377998d2f21e77a1c" [[package]] name = "unicode-ident" From 20ff65b1039df00fab6adf420895379eb640ab04 Mon Sep 17 00:00:00 2001 From: Gwilym Kuiper Date: Tue, 7 Jun 2022 22:14:01 +0100 Subject: [PATCH 3/4] Required for rustc 1.61: need to print the link directories in the correct order now --- mgba-test-runner/build.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mgba-test-runner/build.rs b/mgba-test-runner/build.rs index d91ad4e..79c6e14 100644 --- a/mgba-test-runner/build.rs +++ b/mgba-test-runner/build.rs @@ -17,9 +17,6 @@ fn main() { String::from_utf8_lossy(&out.stderr), ); } - println!("cargo:rustc-link-search={}", out_path.to_str().unwrap()); - println!("cargo:rustc-link-lib=static={}", "mgba-cycle"); - println!("cargo:rustc-link-lib=elf"); cc::Build::new() .file("c/test-runner.c") @@ -28,6 +25,10 @@ fn main() { .debug(true) .compile("test-runner"); + println!("cargo:rustc-link-search={}", out_path.to_str().unwrap()); + println!("cargo:rustc-link-lib=static={}", "mgba-cycle"); + println!("cargo:rustc-link-lib=elf"); + let bindings = bindgen::Builder::default() .header("c/test-runner.h") .generate() From cf2f1369ee17aa7877a1a97821cd6a352f3aaa22 Mon Sep 17 00:00:00 2001 From: GBA bot Date: Tue, 7 Jun 2022 21:16:29 +0000 Subject: [PATCH 4/4] Update lockfiles --- mgba-test-runner/Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mgba-test-runner/Cargo.lock b/mgba-test-runner/Cargo.lock index f2b7a83..c2d341d 100644 --- a/mgba-test-runner/Cargo.lock +++ b/mgba-test-runner/Cargo.lock @@ -48,9 +48,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "bindgen" -version = "0.60.0" +version = "0.60.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0310d795615ac3541fa6312cf5b26b520852118e66165fcd23af4d544dc90a" +checksum = "062dddbc1ba4aca46de6338e2bf87771414c335f7b2f2036e8f3e9befebf88e6" dependencies = [ "bitflags", "cexpr",