fix(rust): Don't update dev-dependencies lacking a version key (#1095) (

#1152) Cherry pick #1095 into v13 and resolve conflicts Fixes #1094
googleapis · Dec 21, 2021 · 56f37d9 · 56f37d9
1 parent ae007fe
commit 56f37d9
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/__snapshots__/cargo-toml.js b/__snapshots__/cargo-toml.js
@@ -10,6 +10,7 @@ normal-dep = "1.2.3"
 
 [dev-dependencies]
 dev-dep = { version = "1.2.3" }
+dev-dep-2 = { path = "../dev-dep-2" }
 
 [build-dependencies]
 # this is using a private registry
@@ -44,6 +45,7 @@ normal-dep = "1.2.3"
 
 [dev-dependencies]
 dev-dep = { version = "1.2.3" }
+dev-dep-2 = { path = "../dev-dep-2" }
 
 [build-dependencies]
 # this is using a private registry

diff --git a/src/updaters/rust/cargo-toml.ts b/src/updaters/rust/cargo-toml.ts
@@ -68,7 +68,12 @@ export class CargoToml extends DefaultUpdater {
         const dep = deps[pkgName];
 
         if (typeof dep === 'string' || typeof dep.path === 'undefined') {
-          logger.info(`skipping ${depKind}.${pkgName} in`);
+          logger.info(`skipping ${depKind}.${pkgName} (no path set)`);
+          continue; // to next depKind
+        }
+
+        if (typeof dep.version === 'undefined') {
+          logger.info(`skipping ${depKind}.${pkgName} (no version set)`);
           continue; // to next depKind
         }
 

diff --git a/test/fixtures/strategies/rust/Cargo-crate2.toml b/test/fixtures/strategies/rust/Cargo-crate2.toml
@@ -3,5 +3,5 @@ name = "crate2"
 version = "0.4.321"
 
 [dependencies]
-crate1 = { version = "0.123.4", path = "../crate2" }
+crate1 = { version = "0.123.4", path = "../crate1" }
 
diff --git a/test/fixtures/strategies/rust/Cargo-workspace.toml b/test/fixtures/strategies/rust/Cargo-workspace.toml
@@ -1,6 +1,6 @@
 [workspace]
 members = [
     "crates/crate1",
-    "crates/crate2",
+    "crates/crate2"
 ]
 
diff --git a/test/updaters/cargo-toml.ts b/test/updaters/cargo-toml.ts
@@ -76,6 +76,7 @@ describe('CargoToml', () => {
       const versions = new Map();
       versions.set('normal-dep', '2.0.0');
       versions.set('dev-dep', '2.0.0');
+      versions.set('dev-dep-2', '2.0.0');
       versions.set('build-dep', '2.0.0');
       versions.set('windows-dep', '2.0.0');
       versions.set('unix-dep', '2.0.0');

diff --git a/test/updaters/fixtures/Cargo-workspace.toml b/test/updaters/fixtures/Cargo-workspace.toml
@@ -1,7 +1,7 @@
 [workspace]
 members = [
     "crates/crate1",
-    "crates/crate2",
+    "crates/crate2"
 ]
 
 
diff --git a/test/updaters/fixtures/Cargo.toml b/test/updaters/fixtures/Cargo.toml
@@ -9,6 +9,7 @@ normal-dep = "1.2.3"
 
 [dev-dependencies]
 dev-dep = { version = "1.2.3" }
+dev-dep-2 = { path = "../dev-dep-2" }
 
 [build-dependencies]
 # this is using a private registry