itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run fmt

Browse Source
This commit is contained in:
Aaron Hill 2021-10-08 15:38:27 -05:00
parent 49ae189b3b
commit 5afcce6b3e
No known key found for this signature in database
GPG Key ID: B4087E510E98B164
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/cargo/commands/report.rs
View File

@ -19,7 +19,7 @@ pub fn cli() -> App {
)
.value_name("id"),
)
.arg_package("Package to display a report for")
.arg_package("Package to display a report for"),
)
}

10
src/cargo/core/compiler/future_incompat.rs
View File

@ -228,10 +228,12 @@ impl OnDiskReports {
fn render_report(per_package_reports: &[FutureIncompatReportPackage]) -> BTreeMap<String, String> {
let mut report: BTreeMap<String, String> = BTreeMap::new();
for per_package in per_package_reports {
let package_spec = format!("{}:{}", per_package.package_id.name(), per_package.package_id.version());
let rendered = report
.entry(package_spec)
.or_default();
let package_spec = format!(
"{}:{}",
per_package.package_id.name(),
per_package.package_id.version()
);
let rendered = report.entry(package_spec).or_default();
rendered.push_str(&format!(
"The package `{}` currently triggers the following future \
incompatibility lints:\n",

17
src/cargo/core/compiler/job_queue.rs
View File

@ -954,8 +954,7 @@ impl<'cfg> DrainState<'cfg> {
.collect::<Vec<_>>()
.join("\n");
let updated_versions =
get_updates(bcx.ws, &package_ids).unwrap_or(String::new());
let updated_versions = get_updates(bcx.ws, &package_ids).unwrap_or(String::new());
let update_message = if !updated_versions.is_empty() {
format!(
@ -1368,15 +1367,19 @@ fn get_updates(ws: &Workspace<'_>, package_ids: &BTreeSet<PackageId>) -> Option<
};
let dep = Dependency::parse(pkg_id.name(), None, pkg_id.source_id()).ok()?;
let summaries = source.query_vec(&dep).ok()?;
let mut updated_versions: Vec<_> = summaries.iter().map(|summary| summary.version())
let mut updated_versions: Vec<_> = summaries
.iter()
.map(|summary| summary.version())
.filter(|version| *version > pkg_id.version())
.collect();
updated_versions.sort();
let updated_versions = iter_join(updated_versions
.into_iter()
.map(|version| version.to_string()),
", ");
let updated_versions = iter_join(
updated_versions
.into_iter()
.map(|version| version.to_string()),
", ",
);
if !updated_versions.is_empty() {
writeln!(