Skip to content

Commit

Permalink
Merge pull request #802 from foresterre/dependabot/cargo/cargo_metada…
Browse files Browse the repository at this point in the history
…ta-0.18.1
  • Loading branch information
foresterre authored Nov 17, 2023
2 parents b6d4971 + 6dd0839 commit cf99679
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/reporter/event.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 0 additions & 8 deletions src/reporter/event/types/list_result/metadata.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@ pub fn package_msrv(package: &Package) -> Option<semver::Version> {
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
}
Expand Down
2 changes: 2 additions & 0 deletions tests/find_msrv.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::items_after_test_module)]

extern crate cargo_msrv;

use cargo_msrv::error::CargoMSRVError;
Expand Down

0 comments on commit cf99679

Please sign in to comment.