feat(manager/cargo): support git dependencies

lib/modules/manager/cargo/__fixtures__/Cargo.1.toml

@@ -20,6 +20,9 @@ pcap-sys = { version = "=0.1", path = "pcap-sys" }
 pnet = { version = "0.21.0", optional = true, default-features = false}
 git_dep_with_version = { version = "0.1.0", git = "https://github.com/foo/bar" }
 git_dep = { git = "https://github.com/foo/bar" }
+git_dep_with_tag = { git = "https://github.com/foo/bar", tag = "1.10.3" }
+git_dep_with_rev = { git = "https://github.com/foo/bar", rev = "abc1234" }
+git_dep_with_branch = { git = "https://github.com/foo/bar", branch = "next" }
 same_version_1__ = "0.0.0"
 same_version_1_ = "0.0.0"
 same_version_1 = "0.0.0"

lib/modules/manager/cargo/__snapshots__/extract.spec.ts.snap

@@ -282,23 +282,63 @@ exports[`modules/manager/cargo/extract extractPackageFile() extracts multiple de
     },
   },
   {
-    "currentValue": "0.1.0",
-    "datasource": "crate",
+    "currentValue": undefined,
+    "datasource": "git-refs",
     "depName": "git_dep_with_version",
     "depType": "dependencies",
     "managerData": {
       "nestedVersion": true,
     },
-    "skipReason": "git-dependency",
+    "packageName": "https://github.com/foo/bar",
+    "skipReason": "unspecified-version",
   },
   {
-    "currentValue": "",
-    "datasource": "crate",
+    "currentValue": undefined,
+    "datasource": "git-refs",
     "depName": "git_dep",
     "depType": "dependencies",
     "managerData": {
       "nestedVersion": false,
     },
+    "packageName": "https://github.com/foo/bar",
+    "skipReason": "unspecified-version",
+  },
+  {
+    "currentValue": "1.10.3",
+    "datasource": "github-tags",
+    "depName": "git_dep_with_tag",
+    "depType": "dependencies",
+    "managerData": {
+      "nestedVersion": false,
+    },
+    "packageName": "foo/bar",
+    "registryUrls": [
+      "https://github.com",
+    ],
+    "skipReason": undefined,
+  },
+  {
+    "currentDigest": "abc1234",
+    "currentValue": "",
+    "datasource": "git-refs",
+    "depName": "git_dep_with_rev",
+    "depType": "dependencies",
+    "managerData": {
+      "nestedVersion": false,
+    },
+    "packageName": "https://github.com/foo/bar",
+    "replaceString": "abc1234",
+    "skipReason": undefined,
+  },
+  {
+    "currentValue": "next",
+    "datasource": "git-refs",
+    "depName": "git_dep_with_branch",
+    "depType": "dependencies",
+    "managerData": {
+      "nestedVersion": false,
+    },
+    "packageName": "https://github.com/foo/bar",
     "skipReason": "git-dependency",
   },
   {

lib/modules/manager/cargo/artifacts.spec.ts

@@ -11,6 +11,7 @@ import type { RepoGlobalConfig } from '../../../config/types';
 import * as docker from '../../../util/exec/docker';
 import { ExecError } from '../../../util/exec/exec-error';
 import * as _hostRules from '../../../util/host-rules';
+import { CrateDatasource } from '../../datasource/crate';
 import type { UpdateArtifactsConfig } from '../types';
 import * as cargo from '.';
 
@@ -132,6 +133,7 @@ describe('modules/manager/cargo/artifacts', () => {
         packageName: 'dep1',
         lockedVersion: '1.0.0',
         newVersion: '1.0.1',
+        datasource: CrateDatasource.id,
       },
     ];
     expect(
@@ -290,18 +292,21 @@ describe('modules/manager/cargo/artifacts', () => {
         packageName: 'dep1',
         lockedVersion: '1.0.0',
         newVersion: '1.0.1',
+        datasource: CrateDatasource.id,
       },
       {
         depName: 'dep2',
         packageName: 'dep2',
         lockedVersion: '1.0.0',
         newVersion: '1.0.2',
+        datasource: CrateDatasource.id,
       },
       {
         depName: 'dep3',
         packageName: 'dep3',
         lockedVersion: '1.0.0',
         newVersion: '1.0.3',
+        datasource: CrateDatasource.id,
       },
     ];
 

lib/modules/manager/cargo/artifacts.ts

@@ -12,6 +12,7 @@
 } from '../../../util/fs';
 import { getGitEnvironmentVariables } from '../../../util/git/auth';
 import { regEx } from '../../../util/regex';
+import { CrateDatasource } from '../../datasource/crate';
 import type { UpdateArtifact, UpdateArtifactsResult, Upgrade } from '../types';
 import { extractLockFileContentVersions } from './locked-version';
 
@@ -130,13 +131,23 @@
         config.constraints?.rust,
       );
     } else {
-      const missingDep = updatedDeps.find((dep) => !dep.lockedVersion);
-      if (missingDep) {
-        // If there is a dependency without a locked version then log a warning
-        // and perform a regular workspace lockfile update.
-        logger.warn(
-          `Missing locked version for dependency \`${missingDep.depName}\``,
-        );
+      const nonCrateDep = updatedDeps.find(
+        (dep) => dep.datasource !== CrateDatasource.id,
+      );
+      const crateDepWithoutLockedVersion = updatedDeps.find(
+        (dep) => !dep.lockedVersion && dep.datasource === CrateDatasource.id,
+      );
+      // Non-crate dependencies (like git ones) do not have locked versions.
+      // For crate dependencies, not having a locked version is not expected.
+      // In both situations, perform a regular workspace lockfile update.
+      if (nonCrateDep || crateDepWithoutLockedVersion) {
+        if (crateDepWithoutLockedVersion) {
+          // Only warn when a crate dependency has no locked version, as this is
+          // not an expected situation.
+          logger.warn(
+            `Missing locked version for dependency \`${crateDepWithoutLockedVersion.depName}\``,
+          );
+        }
         await cargoUpdate(
           packageFileName,
           false,

lib/modules/manager/cargo/extract.spec.ts

@@ -66,7 +66,7 @@ describe('modules/manager/cargo/extract', () => {
     it('extracts multiple dependencies simple', async () => {
       const res = await extractPackageFile(cargo1toml, 'Cargo.toml', config);
       expect(res?.deps).toMatchSnapshot();
-      expect(res?.deps).toHaveLength(15);
+      expect(res?.deps).toHaveLength(18);
     });
 
     it('extracts multiple dependencies advanced', async () => {

lib/modules/manager/cargo/index.ts

@@ -1,5 +1,9 @@
 import type { Category } from '../../../constants';
 import { CrateDatasource } from '../../datasource/crate';
+import { GitRefsDatasource } from '../../datasource/git-refs';
+import { GitTagsDatasource } from '../../datasource/git-tags';
+import { GithubTagsDatasource } from '../../datasource/github-tags';
+import { GitlabTagsDatasource } from '../../datasource/gitlab-tags';
 import * as cargoVersioning from '../../versioning/cargo';
 import { updateArtifacts } from './artifacts';
 import { extractPackageFile } from './extract';
@@ -19,4 +23,10 @@ export const defaultConfig = {
 
 export const categories: Category[] = ['rust'];
 
-export const supportedDatasources = [CrateDatasource.id];
+export const supportedDatasources = [
+  CrateDatasource.id,
+  GithubTagsDatasource.id,
+  GitlabTagsDatasource.id,
+  GitRefsDatasource.id,
+  GitTagsDatasource.id,
+];

lib/modules/manager/cargo/schema.ts

@@ -3,6 +3,7 @@ import type { SkipReason } from '../../../types';
 import { Toml, withDepType } from '../../../util/schema-utils';
 import { CrateDatasource } from '../../datasource/crate';
 import type { PackageDependency } from '../types';
+import { applyGitSource } from '../util';
 import type { CargoManagerData } from './types';
 
 const CargoDep = z.union([
@@ -12,6 +13,12 @@ const CargoDep = z.union([
       path: z.string().optional(),
       /** Git URL for the dependency */
       git: z.string().optional(),
+      /** Git tag for the dependency */
+      tag: z.string().optional(),
+      /** Git revision for the dependency */
+      rev: z.string().optional(),
+      /** Git branch for the dependency */
+      branch: z.string().optional(),
       /** Semver version */
       version: z.string().optional(),
       /** Name of a registry whose URL is configured in `.cargo/config.toml` or `.cargo/config` */
@@ -25,6 +32,9 @@ const CargoDep = z.union([
       ({
         path,
         git,
+        tag,
+        rev,
+        branch,
         version,
         registry,
         package: pkg,
@@ -39,15 +49,6 @@ const CargoDep = z.union([
           nestedVersion = true;
         } else {
           currentValue = '';
-          skipReason = 'invalid-dependency-specification';
-        }
-
-        if (path) {
-          skipReason = 'path-dependency';
-        } else if (git) {
-          skipReason = 'git-dependency';
-        } else if (workspace) {
-          skipReason = 'inherited-dependency';
         }
 
         const dep: PackageDependency<CargoManagerData> = {
@@ -56,6 +57,16 @@ const CargoDep = z.union([
           datasource: CrateDatasource.id,
         };
 
+        if (path) {
+          skipReason = 'path-dependency';
+        } else if (workspace) {
+          skipReason = 'inherited-dependency';
+        } else if (git) {
+          applyGitSource(dep, git, rev, tag, branch);
+        } else if (!version) {
+          skipReason = 'invalid-dependency-specification';
+        }
+
         if (skipReason) {
           dep.skipReason = skipReason;
         }