Update to edition 2024

Author: Lucas Kent

custom-transforms-example/Cargo.toml

@@ -2,7 +2,7 @@
 name = "custom-transforms-example"
 version = "0.0.1"
 authors = ["Ben <ben@instaclustr.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

custom-transforms-example/src/valkey_get_rewrite.rs

@@ -69,10 +69,10 @@ impl Transform for ValkeyGetRewrite {
         chain_state: &'shorter mut ChainState<'longer>,
     ) -> Result<Messages> {
         for message in chain_state.requests.iter_mut() {
-            if let Some(frame) = message.frame() {
-                if is_get(frame) {
-                    self.get_requests.insert(message.id());
-                }
+            if let Some(frame) = message.frame()
+                && is_get(frame)
+            {
+                self.get_requests.insert(message.id());
             }
         }
         let mut responses = chain_state.call_next_transform().await?;
@@ -82,11 +82,10 @@ impl Transform for ValkeyGetRewrite {
                 .request_id()
                 .map(|id| self.get_requests.remove(&id))
                 .unwrap_or(false)
+                && let Some(frame) = response.frame()
             {
-                if let Some(frame) = response.frame() {
-                    rewrite_get(frame, &self.result);
-                    response.invalidate_cache();
-                }
+                rewrite_get(frame, &self.result);
+                response.invalidate_cache();
             }
         }
 

ec2-cargo/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ec2-cargo"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 description = "A tool for running cargo commands in an EC2 instance"
 

ec2-cargo/src/main.rs

@@ -28,11 +28,6 @@ pub struct Args {
 
 #[tokio::main]
 async fn main() {
-    // Needed to disable anyhow stacktraces by default
-    if std::env::var("RUST_LIB_BACKTRACE").is_err() {
-        std::env::set_var("RUST_LIB_BACKTRACE", "0");
-    }
-
     let (non_blocking, _guard) = tracing_appender::non_blocking(std::io::stdout());
     tracing_subscriber::fmt()
         .with_env_filter(EnvFilter::from_default_env())

rustfmt.toml

@@ -1,3 +1,3 @@
 use_field_init_shorthand = true
-edition = "2021"
+edition = "2024"
 style_edition = "2024"

shotover-proxy/Cargo.toml

@@ -2,7 +2,7 @@
 name = "shotover-proxy"
 version = "0.7.2"
 authors = ["Ben <ben@instaclustr.com>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

shotover-proxy/benches/windsock/cloud/aws.rs

@@ -410,13 +410,12 @@ impl RunningShotover {
         ];
 
         while let Some(event) = self.event_rx.recv().await {
-            if let Level::Warn | Level::Error = event.level {
-                if !ignore
+            if let Level::Warn | Level::Error = event.level
+                && !ignore
                     .iter()
                     .any(|ignore| event.fields.message.contains(ignore))
-                {
-                    panic!("Received error/warn event from shotover:\n     {event}")
-                }
+            {
+                panic!("Received error/warn event from shotover:\n     {event}")
             }
         }
     }

shotover-proxy/benches/windsock/cloud/mod.rs

@@ -120,12 +120,12 @@ impl Cloud for AwsCloud {
                 )
             }
         }
-        if let Some(instance) = &resources.bencher {
-            if Arc::strong_count(instance) != 1 {
-                panic!(
-                    "A reference to a bencher instance has been held past the end of the benchmark. Ensure the benchmark destroys all instance references before ending."
-                )
-            }
+        if let Some(instance) = &resources.bencher
+            && Arc::strong_count(instance) != 1
+        {
+            panic!(
+                "A reference to a bencher instance has been held past the end of the benchmark. Ensure the benchmark destroys all instance references before ending."
+            )
         }
 
         // TODO: spin up background tokio task to delete unneeded EC2 instances once we add the functionality to aws_throwaway

shotover-proxy/src/main.rs

@@ -1,5 +1,15 @@
 use shotover::runner::Shotover;
 
 fn main() {
+    // Disable anyhow from taking backtraces, which makes for very verbose logs and is possibly a performance issue.
+    if std::env::var("RUST_LIB_BACKTRACE").is_err() {
+        // Safety: Safe because this is the first thing in main, we know that we havent launched any other threads which may access set_var.
+        // TODO: Avoid usage of unsafe:
+        //       Maybe this https://github.com/dtolnay/anyhow/issues/403 ?
+        //       Or this https://github.com/rust-lang/rust/issues/93346 ?
+        //       Or maybe fork anyhow?
+        unsafe { std::env::set_var("RUST_LIB_BACKTRACE", "0") };
+    }
+
     Shotover::new().run_block();
 }

shotover-proxy/tests/cassandra_int_tests/cluster/mod.rs

@@ -57,8 +57,8 @@ pub async fn run_topology_task(ca_path: Option<&str>, port: Option<u32>) -> Vec<
         .await
         .unwrap()
         .unwrap();
-    let nodes = nodes_rx.borrow().clone();
-    nodes
+
+    nodes_rx.borrow().clone()
 }
 
 fn create_handshake() -> Vec<Message> {