From 0a7d05b61a5c84ae251e191d2d3ca12812784161 Mon Sep 17 00:00:00 2001
From: Daniel Cadenas <dcadenas@gmail.com>
Date: Mon, 27 Jan 2025 12:19:55 -0300
Subject: [PATCH] Lock rust to 1.84 and keep trying to fix hyper-util issue

---
 .github/workflows/rust.yml | 43 +++++++++++++++++++++++++-------------
 Cargo.lock                 |  5 ++---
 Cargo.toml                 |  2 +-
 rust-toolchain.toml        |  4 ++++
 4 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 rust-toolchain.toml

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 8d7332b..93629b5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,23 +1,36 @@
 on: [push, pull_request]
 
-name: Code coverage with grcov
-env:
-    CARGO_TERM_COLOR: always
-
+name: Rust CI
 
 jobs:
-  grcov:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - macOS-latest
+  test:
+    name: Test Suite
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install stable toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+          override: true
+
+      - name: Run tests
+        uses: actions-rs/cargo@v1
+        with:
+          command: test
+          args: --all-features --features ci
+
+  coverage:
+    name: Code Coverage
+    runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install toolchain
+      - name: Install nightly toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
@@ -53,11 +66,11 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           path-to-lcov: ./lcov.info
-          flag-name: run-${{ matrix.os }}
+          flag-name: run-ubuntu-latest
           parallel: true
 
-  grcov_finalize:
-    needs: grcov
+  coverage_finalize:
+    needs: coverage
     runs-on: ubuntu-latest
     steps:
       - name: Coveralls finalization
diff --git a/Cargo.lock b/Cargo.lock
index de424ea..fb2286b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1483,9 +1483,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.6"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1496,7 +1496,6 @@ dependencies = [
  "pin-project-lite",
  "socket2",
  "tokio",
- "tower 0.4.13",
  "tower-service",
  "tracing",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c816632..e58b4cf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ env_logger = "0.11.5"
 futures = "0.3.30"
 gcloud-sdk = { version = "0.25.6", features = ["google-pubsub-v1"] }
 hyper = "1.4.1"
-hyper-util = { version = "=0.1.6", features = ["client", "http1", "client-legacy"] }
+hyper-util = { version = "0.1.10", features = ["client", "http1", "client-legacy"] }
 log = "0.4.22"
 metrics = "0.23.0"
 metrics-exporter-prometheus = "0.15.3"
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..d22e309
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.84.0"
+components = ["rustfmt", "clippy"]
+targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin"]
\ No newline at end of file