From becd09978cc1f2651ff9062ab5a64c59fd64b2ef Mon Sep 17 00:00:00 2001
From: drbh <david.richard.holtz@gmail.com>
Date: Mon, 22 Jan 2024 09:22:54 -0500
Subject: [PATCH] chore: bump rust version and annotate/fix all clippy warnings
 (#1455)

This PR just bumps the latest rust version and makes clippy happy

```bash
cargo clippy --all -- -D warnings
#    Finished dev [unoptimized + debuginfo] target(s) in 0.10s
```
---
 Cargo.toml                          | 1 +
 benchmark/src/app.rs                | 2 +-
 launcher/src/main.rs                | 2 ++
 router/client/src/client.rs         | 2 +-
 router/client/src/sharded_client.rs | 2 ++
 rust-toolchain.toml                 | 5 ++++-
 6 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 24055497..80e6e145 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,6 +6,7 @@ members = [
     "router/grpc-metadata",
     "launcher"
 ]
+resolver = "2"
 
 [workspace.package]
 version = "1.3.4"
diff --git a/benchmark/src/app.rs b/benchmark/src/app.rs
index 49654c1b..b27c56b4 100644
--- a/benchmark/src/app.rs
+++ b/benchmark/src/app.rs
@@ -466,7 +466,7 @@ fn latency_paragraph<'a>(latency: &mut Vec<f64>, name: &'static str) -> Paragrap
     let latency_percentiles = crate::utils::percentiles(latency, &[50, 90, 99]);
 
     // Latency p50/p90/p99 texts
-    let colors = vec![Color::LightGreen, Color::LightYellow, Color::LightRed];
+    let colors = [Color::LightGreen, Color::LightYellow, Color::LightRed];
     for (i, (name, value)) in latency_percentiles.iter().enumerate() {
         let span = Line::from(vec![Span::styled(
             format!("{name}:     {value:.2} ms"),
diff --git a/launcher/src/main.rs b/launcher/src/main.rs
index 4e230205..c5553000 100644
--- a/launcher/src/main.rs
+++ b/launcher/src/main.rs
@@ -53,6 +53,8 @@ impl std::fmt::Display for Quantization {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         // To keep in track with `server`.
         match self {
+            #[allow(deprecated)]
+            // Use `eetq` instead, which provides better latencies overall and is drop-in in most cases
             Quantization::Bitsandbytes => {
                 write!(f, "bitsandbytes")
             }
diff --git a/router/client/src/client.rs b/router/client/src/client.rs
index 4723d664..023c5671 100644
--- a/router/client/src/client.rs
+++ b/router/client/src/client.rs
@@ -224,7 +224,7 @@ pub struct DecodeTimings {
 impl DecodeTimings {
     fn new(concat_ns: Option<u64>, forward_ns: u64, decode_ns: u64, total_ns: u64) -> Self {
         Self {
-            concat: concat_ns.map(|v| Duration::from_nanos(v)),
+            concat: concat_ns.map(Duration::from_nanos),
             forward: Duration::from_nanos(forward_ns),
             decode: Duration::from_nanos(decode_ns),
             total: Duration::from_nanos(total_ns),
diff --git a/router/client/src/sharded_client.rs b/router/client/src/sharded_client.rs
index 6c5da3c7..f0e65ce5 100644
--- a/router/client/src/sharded_client.rs
+++ b/router/client/src/sharded_client.rs
@@ -127,6 +127,7 @@ impl ShardedClient {
             .iter_mut()
             .map(|client| Box::pin(client.prefill(batch.clone())))
             .collect();
+        #[allow(clippy::type_complexity)]
         let results: Result<Vec<(Vec<Generation>, Option<CachedBatch>, PrefillTimings)>> =
             join_all(futures).await.into_iter().collect();
         let mut results = results?;
@@ -159,6 +160,7 @@ impl ShardedClient {
             .iter_mut()
             .map(|client| Box::pin(client.decode(batches.clone())))
             .collect();
+        #[allow(clippy::type_complexity)]
         let results: Result<Vec<(Vec<Generation>, Option<CachedBatch>, DecodeTimings)>> =
             join_all(futures).await.into_iter().collect();
         let mut results = results?;
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 2db1883c..313c018c 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,6 @@
 [toolchain]
-channel = "1.70.0"
+# Released on: 28 December, 2023
+# Branched from master on: 10 November, 2023
+# https://releases.rs/docs/1.75.0/
+channel = "1.75.0"
 components = ["rustfmt", "clippy"]
\ No newline at end of file