From 46351d3b3156eba90e546cdd8a90f2fcc4b2fe97 Mon Sep 17 00:00:00 2001 From: konstin Date: Tue, 1 Jul 2025 10:06:19 +0200 Subject: [PATCH 1/3] Use inline format to fix clippy lints Rust 1.88 changed this lint to on-by-default. --- examples/branching_error_reporting.rs | 4 ++-- examples/caching_dependency_provider.rs | 2 +- examples/doc_interface.rs | 2 +- examples/doc_interface_error.rs | 4 ++-- examples/doc_interface_semantic.rs | 4 ++-- examples/linear_error_reporting.rs | 4 ++-- examples/unsat_root_message_no_version.rs | 6 ++--- src/internal/core.rs | 2 +- src/internal/incompatibility.rs | 2 +- src/internal/partial_solution.rs | 9 +++----- src/report.rs | 28 +++++++++++------------ src/term.rs | 4 ++-- src/version.rs | 2 +- tests/proptest.rs | 2 +- 14 files changed, 35 insertions(+), 40 deletions(-) diff --git a/examples/branching_error_reporting.rs b/examples/branching_error_reporting.rs index b4ef0d8a..09afc9e4 100644 --- a/examples/branching_error_reporting.rs +++ b/examples/branching_error_reporting.rs @@ -55,12 +55,12 @@ fn main() { // Run the algorithm. match resolve(&dependency_provider, "root", (1, 0, 0)) { - Ok(sol) => println!("{:?}", sol), + Ok(sol) => println!("{sol:?}"), Err(PubGrubError::NoSolution(mut derivation_tree)) => { derivation_tree.collapse_no_versions(); eprintln!("{}", DefaultStringReporter::report(&derivation_tree)); std::process::exit(1); } - Err(err) => panic!("{:?}", err), + Err(err) => panic!("{err:?}"), }; } diff --git a/examples/caching_dependency_provider.rs b/examples/caching_dependency_provider.rs index e9728902..1f9a705e 100644 --- a/examples/caching_dependency_provider.rs +++ b/examples/caching_dependency_provider.rs @@ -89,5 +89,5 @@ fn main() { CachingDependencyProvider::new(remote_dependencies_provider); let solution = resolve(&caching_dependencies_provider, "root", 1u32); - println!("Solution: {:?}", solution); + println!("Solution: {solution:?}"); } diff --git a/examples/doc_interface.rs b/examples/doc_interface.rs index fdbd5a2f..ae577699 100644 --- a/examples/doc_interface.rs +++ b/examples/doc_interface.rs @@ -20,5 +20,5 @@ fn main() { // Run the algorithm. let solution = resolve(&dependency_provider, "root", 1u32); - println!("Solution: {:?}", solution); + println!("Solution: {solution:?}"); } diff --git a/examples/doc_interface_error.rs b/examples/doc_interface_error.rs index 608f8b51..c620bea8 100644 --- a/examples/doc_interface_error.rs +++ b/examples/doc_interface_error.rs @@ -72,11 +72,11 @@ fn main() { // Run the algorithm. match resolve(&dependency_provider, "root", (1, 0, 0)) { - Ok(sol) => println!("{:?}", sol), + Ok(sol) => println!("{sol:?}"), Err(PubGrubError::NoSolution(mut derivation_tree)) => { derivation_tree.collapse_no_versions(); eprintln!("{}", DefaultStringReporter::report(&derivation_tree)); } - Err(err) => panic!("{:?}", err), + Err(err) => panic!("{err:?}"), }; } diff --git a/examples/doc_interface_semantic.rs b/examples/doc_interface_semantic.rs index d043b9fd..f8c155bb 100644 --- a/examples/doc_interface_semantic.rs +++ b/examples/doc_interface_semantic.rs @@ -63,11 +63,11 @@ fn main() { // Run the algorithm. match resolve(&dependency_provider, "root", (1, 0, 0)) { - Ok(sol) => println!("{:?}", sol), + Ok(sol) => println!("{sol:?}"), Err(PubGrubError::NoSolution(mut derivation_tree)) => { derivation_tree.collapse_no_versions(); eprintln!("{}", DefaultStringReporter::report(&derivation_tree)); } - Err(err) => panic!("{:?}", err), + Err(err) => panic!("{err:?}"), }; } diff --git a/examples/linear_error_reporting.rs b/examples/linear_error_reporting.rs index 490a6d87..05c3965f 100644 --- a/examples/linear_error_reporting.rs +++ b/examples/linear_error_reporting.rs @@ -37,12 +37,12 @@ fn main() { // Run the algorithm. match resolve(&dependency_provider, "root", (1, 0, 0)) { - Ok(sol) => println!("{:?}", sol), + Ok(sol) => println!("{sol:?}"), Err(PubGrubError::NoSolution(mut derivation_tree)) => { derivation_tree.collapse_no_versions(); eprintln!("{}", DefaultStringReporter::report(&derivation_tree)); std::process::exit(1); } - Err(err) => panic!("{:?}", err), + Err(err) => panic!("{err:?}"), }; } diff --git a/examples/unsat_root_message_no_version.rs b/examples/unsat_root_message_no_version.rs index 3096ac70..d5d45218 100644 --- a/examples/unsat_root_message_no_version.rs +++ b/examples/unsat_root_message_no_version.rs @@ -17,7 +17,7 @@ impl Display for Package { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Package::Root => write!(f, "root"), - Package::Package(name) => write!(f, "{}", name), + Package::Package(name) => write!(f, "{name}"), } } } @@ -218,7 +218,7 @@ fn main() { // Run the algorithm match resolve(&dependency_provider, Package::Root, (0, 0, 0)) { - Ok(sol) => println!("{:?}", sol), + Ok(sol) => println!("{sol:?}"), Err(PubGrubError::NoSolution(derivation_tree)) => { eprintln!("No solution.\n"); @@ -239,6 +239,6 @@ fn main() { eprintln!("```"); std::process::exit(1); } - Err(err) => panic!("{:?}", err), + Err(err) => panic!("{err:?}"), }; } diff --git a/src/internal/core.rs b/src/internal/core.rs index a85c5acb..a61eba0d 100644 --- a/src/internal/core.rs +++ b/src/internal/core.rs @@ -267,7 +267,7 @@ impl State { current_incompat_changed, previous_satisfier_level, ); - log::info!("backtrack to {:?}", previous_satisfier_level); + log::info!("backtrack to {previous_satisfier_level:?}"); satisfier_causes.push((package, current_incompat_id)); return Ok((package, current_incompat_id)); } diff --git a/src/internal/incompatibility.rs b/src/internal/incompatibility.rs index 87998632..5ad1f66b 100644 --- a/src/internal/incompatibility.rs +++ b/src/internal/incompatibility.rs @@ -491,7 +491,7 @@ pub(crate) mod tests { .collect(); let expected = BTreeMap::from([("root".to_string(), 0), ("foo".to_string(), 1)]); - assert_eq!(solution, expected, "{:?}", case); + assert_eq!(solution, expected, "{case:?}"); } } } diff --git a/src/internal/partial_solution.rs b/src/internal/partial_solution.rs index 213893b2..af40795f 100644 --- a/src/internal/partial_solution.rs +++ b/src/internal/partial_solution.rs @@ -144,9 +144,9 @@ impl Display for AssignmentsIntersection { version, term: _, } => { - write!(f, "Decision: level {}, v = {}", decision_level, version) + write!(f, "Decision: level {decision_level}, v = {version}") } - Self::Derivations(term) => write!(f, "Derivations term: {}", term), + Self::Derivations(term) => write!(f, "Derivations term: {term}"), } } } @@ -216,10 +216,7 @@ impl PartialSolution { AssignmentsIntersection::Derivations(term) => { debug_assert!( term.contains(&version), - "{:?}: {} was expected to be contained in {}", - package, - version, - term, + "{package:?}: {version} was expected to be contained in {term}", ) } }, diff --git a/src/report.rs b/src/report.rs index 79f29c58..3b8648c6 100644 --- a/src/report.rs +++ b/src/report.rs @@ -168,39 +168,37 @@ impl Display for Ex fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Self::NotRoot(package, version) => { - write!(f, "we are solving dependencies of {} {}", package, version) + write!(f, "we are solving dependencies of {package} {version}") } Self::NoVersions(package, set) => { if set == &VS::full() { - write!(f, "there is no available version for {}", package) + write!(f, "there is no available version for {package}") } else { - write!(f, "there is no version of {} in {}", package, set) + write!(f, "there is no version of {package} in {set}") } } Self::Custom(package, set, metadata) => { if set == &VS::full() { write!( f, - "dependencies of {} are unavailable {}", - package, metadata + "dependencies of {package} are unavailable {metadata}" ) } else { write!( f, - "dependencies of {} at version {} are unavailable {}", - package, set, metadata + "dependencies of {package} at version {set} are unavailable {metadata}" ) } } Self::FromDependencyOf(p, set_p, dep, set_dep) => { if set_p == &VS::full() && set_dep == &VS::full() { - write!(f, "{} depends on {}", p, dep) + write!(f, "{p} depends on {dep}") } else if set_p == &VS::full() { - write!(f, "{} depends on {} {}", p, dep, set_dep) + write!(f, "{p} depends on {dep} {set_dep}") } else if set_dep == &VS::full() { - write!(f, "{} {} depends on {}", p, set_p, dep) + write!(f, "{p} {set_p} depends on {dep}") } else { - write!(f, "{} {} depends on {} {}", p, set_p, dep, set_dep) + write!(f, "{p} {set_p} depends on {dep} {set_dep}") } } } @@ -289,8 +287,8 @@ impl ReportFormatte match terms_vec.as_slice() { [] => "version solving failed".into(), // TODO: special case when that unique package is root. - [(package, Term::Positive(range))] => format!("{} {} is forbidden", package, range), - [(package, Term::Negative(range))] => format!("{} {} is mandatory", package, range), + [(package, Term::Positive(range))] => format!("{package} {range} is forbidden"), + [(package, Term::Negative(range))] => format!("{package} {range} is mandatory"), [(p1, Term::Positive(r1)), (p2, Term::Negative(r2))] => self.format_external( &External::<_, _, M>::FromDependencyOf(p1, r1.clone(), p2, r2.clone()), ), @@ -298,7 +296,7 @@ impl ReportFormatte &External::<_, _, M>::FromDependencyOf(p2, r2.clone(), p1, r1.clone()), ), slice => { - let str_terms: Vec<_> = slice.iter().map(|(p, t)| format!("{} {}", p, t)).collect(); + let str_terms: Vec<_> = slice.iter().map(|(p, t)| format!("{p} {t}")).collect(); str_terms.join(", ") + " are incompatible" } } @@ -605,7 +603,7 @@ impl DefaultStringReporter { let new_count = self.ref_count + 1; self.ref_count = new_count; if let Some(line) = self.lines.last_mut() { - *line = format!("{} ({})", line, new_count); + *line = format!("{line} ({new_count})"); } } diff --git a/src/term.rs b/src/term.rs index 5aeec7c7..5e800874 100644 --- a/src/term.rs +++ b/src/term.rs @@ -218,8 +218,8 @@ impl AsRef for Term { impl Display for Term { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { - Self::Positive(set) => write!(f, "{}", set), - Self::Negative(set) => write!(f, "Not ( {} )", set), + Self::Positive(set) => write!(f, "{set}"), + Self::Negative(set) => write!(f, "Not ( {set} )"), } } } diff --git a/src/version.rs b/src/version.rs index 445f5d7e..5a39a1e2 100644 --- a/src/version.rs +++ b/src/version.rs @@ -21,7 +21,7 @@ impl serde::Serialize for SemanticVersion { where S: serde::Serializer, { - serializer.serialize_str(&format!("{}", self)) + serializer.serialize_str(&format!("{self}")) } } diff --git a/tests/proptest.rs b/tests/proptest.rs index 74305aad..f56bf759 100644 --- a/tests/proptest.rs +++ b/tests/proptest.rs @@ -601,7 +601,7 @@ fn large_case() { for case in std::fs::read_dir("test-examples").unwrap() { let case = case.unwrap().path(); let name = case.file_name().unwrap().to_string_lossy(); - eprint!("{} ", name); + eprint!("{name} "); let data = std::fs::read_to_string(&case).unwrap(); let start_time = std::time::Instant::now(); if name.ends_with("u16_NumberVersion.ron") || name.ends_with("u16_u32.ron") { From e7b8fcd6c15d73ea5c2cf8468f15b62b7cda2487 Mon Sep 17 00:00:00 2001 From: konstin Date: Tue, 1 Jul 2025 10:08:25 +0200 Subject: [PATCH 2/3] Update to the 2024 edition --- Cargo.toml | 2 +- tests/proptest.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index c7396980..ceb169ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ authors = [ "Alex Tokarev ", "Jacob Finkelman ", ] -edition = "2021" +edition = "2024" description = "PubGrub version solving algorithm" readme = "README.md" repository = "https://github.com/pubgrub-rs/pubgrub" diff --git a/tests/proptest.rs b/tests/proptest.rs index f56bf759..ef592e46 100644 --- a/tests/proptest.rs +++ b/tests/proptest.rs @@ -12,9 +12,9 @@ use proptest::sample::Index; use proptest::string::string_regex; use pubgrub::{ - resolve, DefaultStringReporter, Dependencies, DependencyProvider, DerivationTree, External, + DefaultStringReporter, Dependencies, DependencyProvider, DerivationTree, External, OfflineDependencyProvider, Package, PackageResolutionStatistics, PubGrubError, Ranges, - Reporter, SelectedDependencies, VersionSet, + Reporter, SelectedDependencies, VersionSet, resolve, }; use crate::sat_dependency_provider::SatResolve; @@ -223,7 +223,7 @@ pub fn registry_strategy( let (a, b) = order_index(a, b, len_all_pkgid); let (a, b) = if reverse_alphabetical { (b, a) } else { (a, b) }; let ((dep_name, _), _) = list_of_pkgid[a].to_owned(); - if list_of_pkgid[b].0 .0 == dep_name { + if list_of_pkgid[b].0.0 == dep_name { continue; } let s = &crate_vers_by_name[&dep_name]; @@ -551,11 +551,11 @@ proptest! { ) { let all_versions: Vec<(u16, u32)> = dependency_provider .packages() - .flat_map(|&p| { + .flat_map(|p| { dependency_provider .versions(&p) .unwrap() - .map(move |&v| (p, v)) + .map(move |&v| (*p, v)) }) .collect(); let to_remove: Set<(_, _)> = indexes_to_remove.iter().map(|x| x.get(&all_versions)).cloned().collect(); From f567e076e7fd272f3d1ffe855153c0df7fb1e82a Mon Sep 17 00:00:00 2001 From: konstin Date: Tue, 1 Jul 2025 10:09:05 +0200 Subject: [PATCH 3/3] Rustfmt --- benches/large_case.rs | 2 +- benches/sudoku.rs | 2 +- examples/branching_error_reporting.rs | 4 +-- examples/caching_dependency_provider.rs | 4 +-- examples/doc_interface.rs | 2 +- examples/doc_interface_error.rs | 4 +-- examples/doc_interface_semantic.rs | 4 +-- examples/linear_error_reporting.rs | 4 +-- examples/unsat_root_message_no_version.rs | 8 +++-- src/internal/incompatibility.rs | 38 +++++++++++++---------- src/lib.rs | 2 +- src/report.rs | 5 +-- src/version.rs | 20 ++++++------ tests/examples.rs | 4 +-- tests/tests.rs | 2 +- 15 files changed, 56 insertions(+), 49 deletions(-) diff --git a/benches/large_case.rs b/benches/large_case.rs index 899d8a0d..e65002c8 100644 --- a/benches/large_case.rs +++ b/benches/large_case.rs @@ -5,7 +5,7 @@ use std::time::Duration; use criterion::*; use serde::de::Deserialize; -use pubgrub::{resolve, OfflineDependencyProvider, Package, Range, SemanticVersion, VersionSet}; +use pubgrub::{OfflineDependencyProvider, Package, Range, SemanticVersion, VersionSet, resolve}; fn bench<'a, P: Package + Deserialize<'a>, VS: VersionSet + Deserialize<'a>>( b: &mut Bencher, diff --git a/benches/sudoku.rs b/benches/sudoku.rs index 38081e62..8fc10c8b 100644 --- a/benches/sudoku.rs +++ b/benches/sudoku.rs @@ -3,7 +3,7 @@ //! Uses `Arc` for being closer to real versions. // SPDX-License-Identifier: MPL-2.0 -use pubgrub::{resolve, OfflineDependencyProvider, Range}; +use pubgrub::{OfflineDependencyProvider, Range, resolve}; use std::fmt; use std::sync::Arc; use version_ranges::Ranges; diff --git a/examples/branching_error_reporting.rs b/examples/branching_error_reporting.rs index 09afc9e4..88b3555d 100644 --- a/examples/branching_error_reporting.rs +++ b/examples/branching_error_reporting.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MPL-2.0 use pubgrub::{ - resolve, DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, - SemanticVersion, + DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, + SemanticVersion, resolve, }; type SemVS = Ranges; diff --git a/examples/caching_dependency_provider.rs b/examples/caching_dependency_provider.rs index 1f9a705e..22fec0b5 100644 --- a/examples/caching_dependency_provider.rs +++ b/examples/caching_dependency_provider.rs @@ -3,8 +3,8 @@ use std::cell::RefCell; use pubgrub::{ - resolve, Dependencies, DependencyProvider, OfflineDependencyProvider, - PackageResolutionStatistics, Ranges, + Dependencies, DependencyProvider, OfflineDependencyProvider, PackageResolutionStatistics, + Ranges, resolve, }; type NumVS = Ranges; diff --git a/examples/doc_interface.rs b/examples/doc_interface.rs index ae577699..a79a89b3 100644 --- a/examples/doc_interface.rs +++ b/examples/doc_interface.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use pubgrub::{resolve, OfflineDependencyProvider, Ranges}; +use pubgrub::{OfflineDependencyProvider, Ranges, resolve}; type NumVS = Ranges; diff --git a/examples/doc_interface_error.rs b/examples/doc_interface_error.rs index c620bea8..a7833768 100644 --- a/examples/doc_interface_error.rs +++ b/examples/doc_interface_error.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MPL-2.0 use pubgrub::{ - resolve, DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, - SemanticVersion, + DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, + SemanticVersion, resolve, }; type SemVS = Ranges; diff --git a/examples/doc_interface_semantic.rs b/examples/doc_interface_semantic.rs index f8c155bb..9c3bdbb5 100644 --- a/examples/doc_interface_semantic.rs +++ b/examples/doc_interface_semantic.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MPL-2.0 use pubgrub::{ - resolve, DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, - SemanticVersion, + DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, + SemanticVersion, resolve, }; type SemVS = Ranges; diff --git a/examples/linear_error_reporting.rs b/examples/linear_error_reporting.rs index 05c3965f..0a5d9bf3 100644 --- a/examples/linear_error_reporting.rs +++ b/examples/linear_error_reporting.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MPL-2.0 use pubgrub::{ - resolve, DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, - SemanticVersion, + DefaultStringReporter, OfflineDependencyProvider, PubGrubError, Ranges, Reporter, + SemanticVersion, resolve, }; type SemVS = Ranges; diff --git a/examples/unsat_root_message_no_version.rs b/examples/unsat_root_message_no_version.rs index d5d45218..d9cc5842 100644 --- a/examples/unsat_root_message_no_version.rs +++ b/examples/unsat_root_message_no_version.rs @@ -3,8 +3,8 @@ use std::fmt::{self, Display}; use pubgrub::{ - resolve, DefaultStringReporter, Derived, External, Map, OfflineDependencyProvider, - PubGrubError, Ranges, ReportFormatter, Reporter, SemanticVersion, Term, + DefaultStringReporter, Derived, External, Map, OfflineDependencyProvider, PubGrubError, Ranges, + ReportFormatter, Reporter, SemanticVersion, Term, resolve, }; #[derive(Clone, Debug, PartialEq, Eq, Hash)] @@ -78,7 +78,9 @@ impl ReportFormatter, String> for CustomReportF if set == &Ranges::full() { format!("dependencies of {package} are unavailable because {reason}") } else { - format!("dependencies of {package} at version {set} are unavailable because {reason}") + format!( + "dependencies of {package} at version {set} are unavailable because {reason}" + ) } } External::FromDependencyOf(package, package_set, dependency, dependency_set) => { diff --git a/src/internal/incompatibility.rs b/src/internal/incompatibility.rs index 5ad1f66b..11f64d5a 100644 --- a/src/internal/incompatibility.rs +++ b/src/internal/incompatibility.rs @@ -8,8 +8,8 @@ use std::sync::Arc; use crate::internal::{Arena, HashArena, Id, SmallMap}; use crate::{ - term, DependencyProvider, DerivationTree, Derived, External, Map, Package, Set, Term, - VersionSet, + DependencyProvider, DerivationTree, Derived, External, Map, Package, Set, Term, VersionSet, + term, }; /// An incompatibility is a set of terms for different packages @@ -363,16 +363,20 @@ impl Incompatibilit [(package, Term::Negative(range))] => { format!("{} {} is mandatory", package_store[*package], range) } - [(p_pos, Term::Positive(r_pos)), (p_neg, Term::Negative(r_neg))] - | [(p_neg, Term::Negative(r_neg)), (p_pos, Term::Positive(r_pos))] => { - External::<_, _, M>::FromDependencyOf( - &package_store[*p_pos], - r_pos.clone(), - &package_store[*p_neg], - r_neg.clone(), - ) - .to_string() - } + [ + (p_pos, Term::Positive(r_pos)), + (p_neg, Term::Negative(r_neg)), + ] + | [ + (p_neg, Term::Negative(r_neg)), + (p_pos, Term::Positive(r_pos)), + ] => External::<_, _, M>::FromDependencyOf( + &package_store[*p_pos], + r_pos.clone(), + &package_store[*p_neg], + r_neg.clone(), + ) + .to_string(), slice => { let str_terms: Vec<_> = slice .iter() @@ -479,10 +483,12 @@ pub(crate) mod tests { state.add_package_version_dependencies(next, 1, case.clone()); state.unit_propagation(next).unwrap(); - assert!(state - .partial_solution - .pick_highest_priority_pkg(|_p, _r| (0, Reverse(0))) - .is_none()); + assert!( + state + .partial_solution + .pick_highest_priority_pkg(|_p, _r| (0, Reverse(0))) + .is_none() + ); let solution: BTreeMap = state .partial_solution diff --git a/src/lib.rs b/src/lib.rs index 9eb76bf2..75fe4bbe 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -229,7 +229,7 @@ pub use report::{ DefaultStringReportFormatter, DefaultStringReporter, DerivationTree, Derived, External, ReportFormatter, Reporter, }; -pub use solver::{resolve, Dependencies, DependencyProvider, PackageResolutionStatistics}; +pub use solver::{Dependencies, DependencyProvider, PackageResolutionStatistics, resolve}; pub use term::Term; pub use type_aliases::{DependencyConstraints, Map, SelectedDependencies, Set}; pub use version::{SemanticVersion, VersionParseError}; diff --git a/src/report.rs b/src/report.rs index 3b8648c6..9beedecb 100644 --- a/src/report.rs +++ b/src/report.rs @@ -179,10 +179,7 @@ impl Display for Ex } Self::Custom(package, set, metadata) => { if set == &VS::full() { - write!( - f, - "dependencies of {package} are unavailable {metadata}" - ) + write!(f, "dependencies of {package} are unavailable {metadata}") } else { write!( f, diff --git a/src/version.rs b/src/version.rs index 5a39a1e2..b13fba6a 100644 --- a/src/version.rs +++ b/src/version.rs @@ -167,15 +167,17 @@ impl FromStr for SemanticVersion { #[test] fn from_str_for_semantic_version() { let parse = |str: &str| str.parse::(); - assert!(parse( - &SemanticVersion { - major: 0, - minor: 1, - patch: 0 - } - .to_string() - ) - .is_ok()); + assert!( + parse( + &SemanticVersion { + major: 0, + minor: 1, + patch: 0 + } + .to_string() + ) + .is_ok() + ); assert!(parse("1.2.3").is_ok()); assert_eq!( parse("1.abc.3"), diff --git a/tests/examples.rs b/tests/examples.rs index fcc237c1..216985fd 100644 --- a/tests/examples.rs +++ b/tests/examples.rs @@ -1,8 +1,8 @@ // SPDX-License-Identifier: MPL-2.0 use pubgrub::{ - resolve, DefaultStringReporter, Map, OfflineDependencyProvider, PubGrubError, Ranges, - Reporter as _, SemanticVersion, Set, + DefaultStringReporter, Map, OfflineDependencyProvider, PubGrubError, Ranges, Reporter as _, + SemanticVersion, Set, resolve, }; type NumVS = Ranges; diff --git a/tests/tests.rs b/tests/tests.rs index 8c7f0ff2..e8390f86 100644 --- a/tests/tests.rs +++ b/tests/tests.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use pubgrub::{resolve, OfflineDependencyProvider, PubGrubError, Ranges}; +use pubgrub::{OfflineDependencyProvider, PubGrubError, Ranges, resolve}; type NumVS = Ranges;