Skip to content

Commit ca89a04

Browse files
committed
Use inline format to fix clippy lints
Rust 1.88 changed this lint to on-by-default.
1 parent d25b079 commit ca89a04

14 files changed

+35
-43
lines changed

examples/branching_error_reporting.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ fn main() {
5555

5656
// Run the algorithm.
5757
match resolve(&dependency_provider, "root", (1, 0, 0)) {
58-
Ok(sol) => println!("{:?}", sol),
58+
Ok(sol) => println!("{sol:?}"),
5959
Err(PubGrubError::NoSolution(mut derivation_tree)) => {
6060
derivation_tree.collapse_no_versions();
6161
eprintln!("{}", DefaultStringReporter::report(&derivation_tree));
6262
std::process::exit(1);
6363
}
64-
Err(err) => panic!("{:?}", err),
64+
Err(err) => panic!("{err:?}"),
6565
};
6666
}

examples/caching_dependency_provider.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,5 @@ fn main() {
8989
CachingDependencyProvider::new(remote_dependencies_provider);
9090

9191
let solution = resolve(&caching_dependencies_provider, "root", 1u32);
92-
println!("Solution: {:?}", solution);
92+
println!("Solution: {solution:?}");
9393
}

examples/doc_interface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@ fn main() {
2020

2121
// Run the algorithm.
2222
let solution = resolve(&dependency_provider, "root", 1u32);
23-
println!("Solution: {:?}", solution);
23+
println!("Solution: {solution:?}");
2424
}

examples/doc_interface_error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ fn main() {
7272

7373
// Run the algorithm.
7474
match resolve(&dependency_provider, "root", (1, 0, 0)) {
75-
Ok(sol) => println!("{:?}", sol),
75+
Ok(sol) => println!("{sol:?}"),
7676
Err(PubGrubError::NoSolution(mut derivation_tree)) => {
7777
derivation_tree.collapse_no_versions();
7878
eprintln!("{}", DefaultStringReporter::report(&derivation_tree));
7979
}
80-
Err(err) => panic!("{:?}", err),
80+
Err(err) => panic!("{err:?}"),
8181
};
8282
}

examples/doc_interface_semantic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ fn main() {
6363

6464
// Run the algorithm.
6565
match resolve(&dependency_provider, "root", (1, 0, 0)) {
66-
Ok(sol) => println!("{:?}", sol),
66+
Ok(sol) => println!("{sol:?}"),
6767
Err(PubGrubError::NoSolution(mut derivation_tree)) => {
6868
derivation_tree.collapse_no_versions();
6969
eprintln!("{}", DefaultStringReporter::report(&derivation_tree));
7070
}
71-
Err(err) => panic!("{:?}", err),
71+
Err(err) => panic!("{err:?}"),
7272
};
7373
}

examples/linear_error_reporting.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ fn main() {
3737

3838
// Run the algorithm.
3939
match resolve(&dependency_provider, "root", (1, 0, 0)) {
40-
Ok(sol) => println!("{:?}", sol),
40+
Ok(sol) => println!("{sol:?}"),
4141
Err(PubGrubError::NoSolution(mut derivation_tree)) => {
4242
derivation_tree.collapse_no_versions();
4343
eprintln!("{}", DefaultStringReporter::report(&derivation_tree));
4444
std::process::exit(1);
4545
}
46-
Err(err) => panic!("{:?}", err),
46+
Err(err) => panic!("{err:?}"),
4747
};
4848
}

examples/unsat_root_message_no_version.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl Display for Package {
1717
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
1818
match self {
1919
Package::Root => write!(f, "root"),
20-
Package::Package(name) => write!(f, "{}", name),
20+
Package::Package(name) => write!(f, "{name}"),
2121
}
2222
}
2323
}
@@ -218,7 +218,7 @@ fn main() {
218218

219219
// Run the algorithm
220220
match resolve(&dependency_provider, Package::Root, (0, 0, 0)) {
221-
Ok(sol) => println!("{:?}", sol),
221+
Ok(sol) => println!("{sol:?}"),
222222
Err(PubGrubError::NoSolution(derivation_tree)) => {
223223
eprintln!("No solution.\n");
224224

@@ -239,6 +239,6 @@ fn main() {
239239
eprintln!("```");
240240
std::process::exit(1);
241241
}
242-
Err(err) => panic!("{:?}", err),
242+
Err(err) => panic!("{err:?}"),
243243
};
244244
}

src/internal/core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ impl<DP: DependencyProvider> State<DP> {
267267
current_incompat_changed,
268268
previous_satisfier_level,
269269
);
270-
log::info!("backtrack to {:?}", previous_satisfier_level);
270+
log::info!("backtrack to {previous_satisfier_level:?}");
271271
satisfier_causes.push((package, current_incompat_id));
272272
return Ok((package, current_incompat_id));
273273
}

src/internal/incompatibility.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ pub(crate) mod tests {
491491
.collect();
492492
let expected = BTreeMap::from([("root".to_string(), 0), ("foo".to_string(), 1)]);
493493

494-
assert_eq!(solution, expected, "{:?}", case);
494+
assert_eq!(solution, expected, "{case:?}");
495495
}
496496
}
497497
}

src/internal/partial_solution.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ impl<VS: VersionSet> Display for AssignmentsIntersection<VS> {
144144
version,
145145
term: _,
146146
} => {
147-
write!(f, "Decision: level {}, v = {}", decision_level, version)
147+
write!(f, "Decision: level {decision_level}, v = {version}")
148148
}
149-
Self::Derivations(term) => write!(f, "Derivations term: {}", term),
149+
Self::Derivations(term) => write!(f, "Derivations term: {term}"),
150150
}
151151
}
152152
}
@@ -216,10 +216,7 @@ impl<DP: DependencyProvider> PartialSolution<DP> {
216216
AssignmentsIntersection::Derivations(term) => {
217217
debug_assert!(
218218
term.contains(&version),
219-
"{:?}: {} was expected to be contained in {}",
220-
package,
221-
version,
222-
term,
219+
"{package:?}: {version} was expected to be contained in {term}",
223220
)
224221
}
225222
},

0 commit comments

Comments
 (0)