chore: upgrade to rust 2024

Author: fisherdarling

.github/workflows/ci.yml

@@ -141,8 +141,8 @@ jobs:
         # Workaround for rust-lang/cargo#7732
         # based on tokio's ci job
         run: |
-          if ! rustfmt --check --edition 2021 $(git ls-files '*.rs'); then
-            printf "Please run \`rustfmt --edition 2021 \$(git ls-files '*.rs')\` to fix rustfmt errors.\n" >&2
+          if ! rustfmt --check --edition 2024 $(git ls-files '*.rs'); then
+            printf "Please run \`rustfmt --edition 2024 \$(git ls-files '*.rs')\` to fix rustfmt errors.\n" >&2
             exit 1
           fi
 

Cargo.toml

@@ -5,12 +5,12 @@ members = [
     "examples",
     "tools/gen-syscall-enum",
 ]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 version = "5.4.0"
 repository = "https://github.com/cloudflare/foundations"
-edition = "2021"
+edition = "2024"
 authors = ["Cloudflare"]
 license = "BSD-3-Clause"
 

foundations-macros/src/metrics/mod.rs

@@ -317,15 +317,12 @@ fn metric_init(foundations: &Path, fn_: &ItemFn) -> proc_macro2::TokenStream {
     );
 
     // Validate histogram buckets at compile time if this is a HistogramBuilder
-    if let Some(ctor) = ctor {
-        if let Some(path) = ctor.path.get_ident() {
-            if path == "HistogramBuilder" {
-                // Validate the histogram buckets
-                if let Err(err) = validation::validate_histogram_buckets(ctor) {
-                    return err.to_compile_error();
-                }
-            }
-        }
+    if let Some(ctor) = ctor
+        && let Some(path) = ctor.path.get_ident()
+        && path == "HistogramBuilder"
+        && let Err(err) = validation::validate_histogram_buckets(ctor)
+    {
+        return err.to_compile_error();
     }
 
     let metric_init = match ctor {

foundations/src/telemetry/driver.rs

@@ -7,7 +7,7 @@ use futures_util::stream::FuturesUnordered;
 use futures_util::{FutureExt, Stream};
 use std::future::Future;
 use std::pin::Pin;
-use std::task::{Context, Poll};
+use std::task::{Context, Poll, ready};
 
 feature_use!(cfg(feature = "telemetry-server"), {
     use super::server::TelemetryServerFuture;
@@ -89,25 +89,23 @@ impl Future for TelemetryDriver {
     type Output = BootstrapResult<()>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let mut ready_res = vec![];
+        #[cfg_attr(not(feature = "telemetry-server"), allow(unused_mut))]
+        let mut server_res = Poll::Ready(Ok(()));
 
         #[cfg(feature = "telemetry-server")]
         if let Some(server_fut) = &mut self.server_fut {
-            if let Poll::Ready(res) = Pin::new(server_fut).poll(cx) {
-                match res {}
-            }
+            // This future is always pending
+            let Poll::Pending = Pin::new(server_fut).poll(cx);
+            server_res = Poll::Pending;
         }
 
-        let tele_futures_poll = Pin::new(&mut self.tele_futures).poll_next(cx);
-
-        if let Poll::Ready(Some(res)) = tele_futures_poll {
-            ready_res.push(res);
-        }
-
-        if ready_res.is_empty() {
-            Poll::Pending
-        } else {
-            Poll::Ready(ready_res.into_iter().collect())
+        loop {
+            // Keep polling tele_futures until it becomes pending, empty, or a future errors
+            let tele_res = ready!(Pin::new(&mut self.tele_futures).poll_next(cx)?);
+            if tele_res.is_none() {
+                // tele_futures is done, but we may still need to poll server_fut
+                return server_res;
+            }
         }
     }
 }

foundations/src/telemetry/metrics/internal.rs

@@ -102,10 +102,9 @@ impl Registries {
         };
 
         let mut prefix = Cow::Borrowed(subsystem);
-        if with_service_prefix {
-            if let MetricsServiceName::Prefix(service) = &registries.service_name {
-                prefix = format!("{service}_{subsystem}").into();
-            }
+        if with_service_prefix && let MetricsServiceName::Prefix(service) = &registries.service_name
+        {
+            prefix = format!("{service}_{subsystem}").into();
         }
 
         parking_lot::RwLockWriteGuard::map(registry.write(), move |mut reg| {

foundations/src/telemetry/server/mod.rs

@@ -170,10 +170,10 @@ impl TelemetryServerFuture {
             #[cfg(unix)]
             ListenAddr::Unix(path) => {
                 // Remove existing socket file if it exists to avoid bind errors
-                if path.exists() {
-                    if let Err(e) = std::fs::remove_file(path) {
-                        log::warn!("failed to remove existing Unix socket file"; "path" => %path.display(), "error" => e);
-                    }
+                if path.exists()
+                    && let Err(e) = std::fs::remove_file(path)
+                {
+                    log::warn!("failed to remove existing Unix socket file"; "path" => %path.display(), "error" => e);
                 }
 
                 let unix_listener = UnixListener::bind(path)

tools/gen-syscall-enum/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gen-syscall-enum"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 publish = false
 
 [package.metadata.release]