Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 17 insertions, 16 deletions

diff --git a/src/tools/cargo/.github/PULL_REQUEST_TEMPLATE.md b/src/tools/cargo/.github/PULL_REQUEST_TEMPLATE.md
index 141ac5ed4..f8ff10d15 100644
--- a/src/tools/cargo/.github/PULL_REQUEST_TEMPLATE.md
+++ b/src/tools/cargo/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,13 +1,8 @@
 <!-- homu-ignore:start -->
 <!--
-NOTICE: Due to limited review capacity, the Cargo team is not accepting new
-features or major changes at this time. Please consult with the team before
-opening a new PR. Only issues that have been explicitly marked as accepted
-will be reviewed.
-
 Thanks for submitting a pull request 🎉! Here are some tips for you:
 
-* If this is your first contribution, read "Cargo Contribution Guide":
+* If this is your first contribution, read "Cargo Contribution Guide" first:
   https://doc.crates.io/contrib/
 * Run `cargo fmt --all` to format your code changes.
 * Small commits and pull requests are always preferable and easy to review.
diff --git a/src/tools/cargo/.github/renovate.json5 b/src/tools/cargo/.github/renovate.json5
index 03e6d8da8..ca9c2a813 100644
--- a/src/tools/cargo/.github/renovate.json5
+++ b/src/tools/cargo/.github/renovate.json5
@@ -6,7 +6,7 @@
   configMigration: true,
   dependencyDashboard: false,
   ignorePaths: [
-    "**/tests/**",
+    '**/tests/**',
   ],
   customManagers: [
     {
@@ -40,7 +40,7 @@
     {
       commitMessageTopic: 'MSRV (1 version)',
       matchManagers: [
-        'regex',
+        'custom.regex',
       ],
       matchPackageNames: [
         'MSRV:1',
@@ -53,12 +53,12 @@
     {
       commitMessageTopic: 'MSRV (3 versions)',
       matchManagers: [
-        'regex',
+        'custom.regex',
       ],
       matchPackageNames: [
         'MSRV:3',
       ],
-      "extractVersion": "^(?<version>\\d+\\.\\d+)",  // Drop the patch version
+      extractVersion: '^(?<version>\\d+\\.\\d+)',  // Drop the patch version
       schedule: [
         '* * * * *',
       ],
@@ -66,6 +66,16 @@
       internalChecksFilter: 'strict',
       groupName: 'msrv',
     },
+    {
+      matchManagers: [
+        'cargo',
+      ],
+      matchPackageNames: [
+        'gix-features-for-configuration-only',
+        'gix',
+      ],
+      groupName: 'gix',
+    },
     // Goals:
     // - Rollup safe upgrades to reduce CI runner load
     // - Have lockfile and manifest in-sync (implicit rules)
diff --git a/src/tools/cargo/.github/workflows/main.yml b/src/tools/cargo/.github/workflows/main.yml
index 7b8055223..a49ac0988 100644
--- a/src/tools/cargo/.github/workflows/main.yml
+++ b/src/tools/cargo/.github/workflows/main.yml
@@ -66,9 +66,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: rustup update stable && rustup default stable
       - run: rustup component add clippy
-      # Only check cargo lib for now
-      # TODO: check every members
-      - run: cargo clippy -p cargo --lib --no-deps -- -D warnings
+      - run: cargo clippy --workspace --all-targets --no-deps -- -D warnings
 
   stale-label:
     runs-on: ubuntu-latest
@@ -110,8 +108,6 @@ jobs:
       CARGO_PROFILE_TEST_DEBUG: 1
       CARGO_INCREMENTAL: 0
       CARGO_PUBLIC_NETWORK_TESTS: 1
-      # Deny warnings on CI to avoid warnings getting into the codebase.
-      RUSTFLAGS: -D warnings
     strategy:
       matrix:
         include:
@@ -152,7 +148,7 @@ jobs:
     - run: rustup target add ${{ matrix.other }}
     - run: rustup component add rustc-dev llvm-tools-preview rust-docs
       if: startsWith(matrix.rust, 'nightly')
-    - run: sudo apt update -y && sudo apt install gcc-multilib libsecret-1-0 libsecret-1-dev -y
+    - run: sudo apt update -y && sudo apt install lldb gcc-multilib libsecret-1-0 libsecret-1-dev -y
       if: matrix.os == 'ubuntu-latest'
     - run: rustup component add rustfmt || echo "rustfmt not available"
     - name: Configure extra test environment