From 7ffba677fd0f0c29d076df74ab354596c4aa7164 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Mon, 18 Oct 2021 12:06:32 -0500 Subject: [PATCH] Run fmt --- src/cargo/core/compiler/future_incompat.rs | 12 +++++------- src/cargo/core/compiler/job_queue.rs | 5 ++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/cargo/core/compiler/future_incompat.rs b/src/cargo/core/compiler/future_incompat.rs index a8af2d5ee9e..94d70209c45 100644 --- a/src/cargo/core/compiler/future_incompat.rs +++ b/src/cargo/core/compiler/future_incompat.rs @@ -239,7 +239,7 @@ fn render_report(per_package_reports: &[FutureIncompatReportPackage]) -> BTreeMa ); let rendered = report.entry(package_spec).or_default(); rendered.push_str(&format!( -"The package `{}` currently triggers the following future incompatibility lints:\n", + "The package `{}` currently triggers the following future incompatibility lints:\n", per_package.package_id )); for item in &per_package.items { @@ -359,7 +359,6 @@ pub fn save_and_display_report( }; let report_id = current_reports.next_id; - // Get a list of unique and sorted package name/versions. let package_ids: BTreeSet<_> = per_package_future_incompat_reports .iter() @@ -409,10 +408,10 @@ You may want to consider updating them to a newer version to see if the issue ha ) }) .collect::>() - .join("\n"); + .join("\n"); let suggestion_message = format!( - " + " To solve this problem, you can try the following approaches: {update_message} @@ -427,11 +426,10 @@ section in `Cargo.toml` to use your own version of the dependency. For more information, see: https://doc.rust-lang.org/cargo/reference/overriding-dependencies.html#the-patch-section ", - upstream_info = upstream_info, - update_message = update_message, + upstream_info = upstream_info, + update_message = update_message, ); - current_reports.save_report( bcx.ws, suggestion_message.clone(), diff --git a/src/cargo/core/compiler/job_queue.rs b/src/cargo/core/compiler/job_queue.rs index ed9c20fed36..322205d6ebb 100644 --- a/src/cargo/core/compiler/job_queue.rs +++ b/src/cargo/core/compiler/job_queue.rs @@ -871,7 +871,10 @@ impl<'cfg> DrainState<'cfg> { if !cx.bcx.build_config.build_plan { // It doesn't really matter if this fails. drop(cx.bcx.config.shell().status("Finished", message)); - future_incompat::save_and_display_report(cx.bcx, &self.per_package_future_incompat_reports); + future_incompat::save_and_display_report( + cx.bcx, + &self.per_package_future_incompat_reports, + ); } None