diff --git a/src/api_check.rs b/src/api_check.rs index 9fb30a48..850c9ef2 100644 --- a/src/api_check.rs +++ b/src/api_check.rs @@ -183,7 +183,7 @@ fn build_report( packages.push(PackageReport { package: pkg.name.clone(), baseline, - commit_bump: format!("{commit_bump:?}").to_lowercase(), + commit_bump: commit_bump.to_string(), disagrees: disagrees(commit_bump, &api), api, }); diff --git a/src/config/workspace_discovery.rs b/src/config/workspace_discovery.rs index 0cab2957..0832e8de 100644 --- a/src/config/workspace_discovery.rs +++ b/src/config/workspace_discovery.rs @@ -40,28 +40,30 @@ const SKIP_DIRS: &[&str] = &[ const MAX_DEPTH: usize = 6; pub(super) fn discover(root: &Path) -> Vec { - let mut found: Vec = [ - node::source(root), - cargo::source(root), - go::source(root), - gradle::source(root), - ] - .iter() - .filter(|source| !source.globs.is_empty()) - .flat_map(|source| source.collect(root)) - .collect(); - found.sort_by(|a, b| a.path.cmp(&b.path)); - found.dedup_by(|a, b| a.path == b.path); - found + collect_sorted( + root, + [ + node::source(root), + cargo::source(root), + go::source(root), + gradle::source(root), + ], + ) } pub(super) fn discover_node(root: &Path) -> Vec { - let source = node::source(root); - let mut found = if source.globs.is_empty() { - Vec::new() - } else { - source.collect(root) - }; + collect_sorted(root, [node::source(root)]) +} + +fn collect_sorted( + root: &Path, + sources: impl IntoIterator, +) -> Vec { + let mut found: Vec = sources + .into_iter() + .filter(|source| !source.globs.is_empty()) + .flat_map(|source| source.collect(root)) + .collect(); found.sort_by(|a, b| a.path.cmp(&b.path)); found.dedup_by(|a, b| a.path == b.path); found diff --git a/src/monorepo/plan_interactive.rs b/src/monorepo/plan_interactive.rs index ed8c79f1..e1f35618 100644 --- a/src/monorepo/plan_interactive.rs +++ b/src/monorepo/plan_interactive.rs @@ -252,7 +252,7 @@ fn render(rows: &[Row], overrides: &BTreeMap, config: &Config) row.package, row.current, version.green(), - format!("{bump:?}").to_lowercase().green() + bump.to_string().green() ); } None => match &row.planned {