From 81482e9114e0d34c4c42e11bd33fb2f99fc7eaed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 06:18:43 +0000 Subject: [PATCH 1/2] build(deps): bump git2 from 0.17.0 to 0.18.0 Bumps [git2](https://github.com/rust-lang/git2-rs) from 0.17.0 to 0.18.0. - [Changelog](https://github.com/rust-lang/git2-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/git2-rs/compare/git2-curl-0.17.0...git2-0.18.0) --- updated-dependencies: - dependency-name: git2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c58d66d..a3115dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -519,11 +519,11 @@ dependencies = [ [[package]] name = "git2" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89511277159354bea13ae1e53e0c9ab85ba1b20d7e91618fa30e6bc5566857fb" +checksum = "12ef350ba88a33b4d524b1d1c79096c9ade5ef8c59395df0e60d1e1889414c0e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "libc", "libgit2-sys", "log", @@ -805,9 +805,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libgit2-sys" -version = "0.15.0+1.6.3" +version = "0.16.1+1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "032e537ae4dd4e50c877f258dc55fcd0657b5021f454094a425bb6bcc9edea4c" +checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c" dependencies = [ "cc", "libc", diff --git a/Cargo.toml b/Cargo.toml index a08cf48..ecfd90b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ env_logger = "0.10.0" thiserror = "1" anyhow = "1" flate2 = "1.0.24" -git2 = "0.17.0" +git2 = "0.18.0" log = "0.4" pbr = "1.1.1" reqwest = { version = "0.11.12", features = ["blocking", "json"] } From c2cddd32a56649c35019b1550919b139db734501 Mon Sep 17 00:00:00 2001 From: Oli Scherer Date: Mon, 4 Sep 2023 09:14:41 +0000 Subject: [PATCH 2/2] rustfmt --- src/main.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index cdf61b4..5cd81fa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1185,7 +1185,11 @@ impl Config { fn search_perf_builds(&self, toolchain: &Toolchain) -> anyhow::Result { eprintln!("Attempting to search unrolled perf builds"); - let Toolchain {spec: ToolchainSpec::Ci { commit, .. }, ..} = toolchain else { + let Toolchain { + spec: ToolchainSpec::Ci { commit, .. }, + .. + } = toolchain + else { bail!("not a ci commit"); }; let summary = get_commit(commit)?.summary; @@ -1231,7 +1235,9 @@ impl Config { .collect::>(); let Some(found) = toolchains.iter().position(|t| { - self.install_and_test(t, &dl_spec).unwrap_or(Satisfies::Unknown) == Satisfies::Yes + self.install_and_test(t, &dl_spec) + .unwrap_or(Satisfies::Unknown) + == Satisfies::Yes }) else { bail!("none of the toolchains satisfied the predicate"); };