Skip to content

Commit 529bbeb

Browse files
committed
refactor: merge duplicate dep_usage push, update stale comments
1 parent fa426c6 commit 529bbeb

2 files changed

Lines changed: 6 additions & 14 deletions

File tree

src/check.rs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,9 @@ pub fn run_checks(workspace: &WorkspaceInfo, promotion_threshold: usize) -> Vec<
2525

2626
let lookup_name = dep.package.as_deref().unwrap_or(&dep.name);
2727

28-
if let Some(ws_dep) = workspace.workspace_deps.get(lookup_name) {
29-
// If registries differ, the workspace dep doesn't apply —
30-
// treat as an independent dep eligible for promotion.
31-
if dep.registry != ws_dep.registry {
32-
dep_usage
33-
.entry((lookup_name.to_string(), dep.registry.clone()))
34-
.or_default()
35-
.push((member_rel.clone(), dep.version.clone()));
36-
continue;
37-
}
38-
28+
if let Some(ws_dep) = workspace.workspace_deps.get(lookup_name)
29+
&& dep.registry == ws_dep.registry
30+
{
3931
let kind = match (&dep.version, &ws_dep.version) {
4032
(Some(dv), Some(wv)) if dv != wv => DiagnosticKind::VersionMismatch {
4133
version: dep.version.clone(),

src/fix.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ fn fix_member_dep(manifest_path: &Path, dep_name: &str) -> Result<bool, String>
141141

142142
/// Rewrite a dependency entry to use `{ workspace = true }`.
143143
///
144-
/// Strips `version` and `default-features` (which must be set at the workspace
145-
/// level to have any effect). Preserves other keys like `features` and `optional`.
144+
/// Strips `version`, `default-features`, and `registry` (which must be set at
145+
/// the workspace level). Preserves other keys like `features` and `optional`.
146146
fn rewrite_dep_entry(table: &mut dyn toml_edit::TableLike, key: &str) -> bool {
147147
let Some(item) = table.get_mut(key) else {
148148
return false;
@@ -173,7 +173,7 @@ fn rewrite_dep_entry(table: &mut dyn toml_edit::TableLike, key: &str) -> bool {
173173
if existing.get("workspace").and_then(|v| v.as_bool()) == Some(true) {
174174
return false;
175175
}
176-
// Rebuild with workspace = true, dropping version and default-features
176+
// Rebuild with workspace = true, dropping version, default-features, and registry
177177
let mut rebuilt = InlineTable::new();
178178
rebuilt.insert("workspace", Value::from(true));
179179
for (k, v) in existing.iter() {

0 commit comments

Comments
 (0)