Skip to content

Commit 5afcce6

Browse files
committed
Run fmt
1 parent 49ae189 commit 5afcce6

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

src/bin/cargo/commands/report.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ pub fn cli() -> App {
1919
)
2020
.value_name("id"),
2121
)
22-
.arg_package("Package to display a report for")
22+
.arg_package("Package to display a report for"),
2323
)
2424
}
2525

src/cargo/core/compiler/future_incompat.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ impl OnDiskReports {
228228
fn render_report(per_package_reports: &[FutureIncompatReportPackage]) -> BTreeMap<String, String> {
229229
let mut report: BTreeMap<String, String> = BTreeMap::new();
230230
for per_package in per_package_reports {
231-
let package_spec = format!("{}:{}", per_package.package_id.name(), per_package.package_id.version());
232-
let rendered = report
233-
.entry(package_spec)
234-
.or_default();
231+
let package_spec = format!(
232+
"{}:{}",
233+
per_package.package_id.name(),
234+
per_package.package_id.version()
235+
);
236+
let rendered = report.entry(package_spec).or_default();
235237
rendered.push_str(&format!(
236238
"The package `{}` currently triggers the following future \
237239
incompatibility lints:\n",

src/cargo/core/compiler/job_queue.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -954,8 +954,7 @@ impl<'cfg> DrainState<'cfg> {
954954
.collect::<Vec<_>>()
955955
.join("\n");
956956

957-
let updated_versions =
958-
get_updates(bcx.ws, &package_ids).unwrap_or(String::new());
957+
let updated_versions = get_updates(bcx.ws, &package_ids).unwrap_or(String::new());
959958

960959
let update_message = if !updated_versions.is_empty() {
961960
format!(
@@ -1368,15 +1367,19 @@ fn get_updates(ws: &Workspace<'_>, package_ids: &BTreeSet<PackageId>) -> Option<
13681367
};
13691368
let dep = Dependency::parse(pkg_id.name(), None, pkg_id.source_id()).ok()?;
13701369
let summaries = source.query_vec(&dep).ok()?;
1371-
let mut updated_versions: Vec<_> = summaries.iter().map(|summary| summary.version())
1370+
let mut updated_versions: Vec<_> = summaries
1371+
.iter()
1372+
.map(|summary| summary.version())
13721373
.filter(|version| *version > pkg_id.version())
13731374
.collect();
13741375
updated_versions.sort();
13751376

1376-
let updated_versions = iter_join(updated_versions
1377-
.into_iter()
1378-
.map(|version| version.to_string()),
1379-
", ");
1377+
let updated_versions = iter_join(
1378+
updated_versions
1379+
.into_iter()
1380+
.map(|version| version.to_string()),
1381+
", ",
1382+
);
13801383

13811384
if !updated_versions.is_empty() {
13821385
writeln!(

0 commit comments

Comments
 (0)