From 714d11f7452079d61d7cc939272134840b553932 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 01:23:37 +0000 Subject: [PATCH 1/3] build(deps): bump cargo_metadata from 0.15.4 to 0.18.1 Bumps [cargo_metadata](https://github.com/oli-obk/cargo_metadata) from 0.15.4 to 0.18.1. - [Release notes](https://github.com/oli-obk/cargo_metadata/releases) - [Changelog](https://github.com/oli-obk/cargo_metadata/blob/main/CHANGELOG.md) - [Commits](https://github.com/oli-obk/cargo_metadata/compare/0.15.4...0.18.1) --- updated-dependencies: - dependency-name: cargo_metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: Martijn Gribnau --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- src/reporter/event/types/list_result/metadata.rs | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68d844d5..46a855e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -636,9 +636,9 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.15.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" +checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform", diff --git a/Cargo.toml b/Cargo.toml index ea374ab6..94ae6573 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ tag-name = "v{{version}}" [dependencies] bisector = "0.4.0" # bisection with a custom comparator camino = "1.1" # utf-8 paths -cargo_metadata = "0.15.4" # resolving Cargo manifest metadata (consider `guppy`!) +cargo_metadata = "0.18.1" # resolving Cargo manifest metadata (consider `guppy`!) clap = { version = "4.4.7", features = ["derive"] } # parse CLI arguments dirs = "5.0.1" # common directories indicatif = "=0.17.7" # UI diff --git a/src/reporter/event/types/list_result/metadata.rs b/src/reporter/event/types/list_result/metadata.rs index cf419906..2ae75c7a 100644 --- a/src/reporter/event/types/list_result/metadata.rs +++ b/src/reporter/event/types/list_result/metadata.rs @@ -10,14 +10,6 @@ pub fn package_msrv(package: &Package) -> Option { package .rust_version .clone() - .map(|req| { - let comparator = &req.comparators[0]; - crate::semver::Version::new( - comparator.major, - comparator.minor.unwrap_or_default(), - comparator.patch.unwrap_or_default(), - ) - }) .or_else(|| get_package_metadata_msrv(package)) .or_else(|| parse_manifest_workaround(package.manifest_path.as_path())) // todo: add last one as option to config } From 698c6d7d25c02a7cc4afc2e24b9b285c9278dc78 Mon Sep 17 00:00:00 2001 From: Martijn Gribnau Date: Fri, 17 Nov 2023 02:50:09 +0100 Subject: [PATCH 2/3] fix: Remove unused export from event module --- src/reporter/event.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/reporter/event.rs b/src/reporter/event.rs index 0c4e463b..07eebb7c 100644 --- a/src/reporter/event.rs +++ b/src/reporter/event.rs @@ -7,9 +7,6 @@ pub use scope::{Marker, Scope, ScopeCounter, ScopeGenerator, SupplyScopeGenerato #[cfg(test)] pub use scope::TestScopeGenerator; -// shared -pub use shared::compatibility::Compatibility; - // events pub use auxiliary_output::{ AuxiliaryOutput, Destination, Item as AuxiliaryOutputItem, MsrvKind, ToolchainFileKind, From 6dd083907964de59094e21347b96747cc764e0c4 Mon Sep 17 00:00:00 2001 From: Martijn Gribnau Date: Fri, 17 Nov 2023 03:06:59 +0100 Subject: [PATCH 3/3] fix: allow clippy::items_after_test_module) lint for find_msrv integration test module --- tests/find_msrv.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/find_msrv.rs b/tests/find_msrv.rs index 19053ae7..8a0da3a0 100644 --- a/tests/find_msrv.rs +++ b/tests/find_msrv.rs @@ -1,3 +1,5 @@ +#![allow(clippy::items_after_test_module)] + extern crate cargo_msrv; use cargo_msrv::error::CargoMSRVError;