[meta] migrate to 2024 edition (#9398)

Did this by:

* running `cargo fix --edition`
* manually reverting the changes from `match` to `if let`
* inspecting the rest of the changes

Due to drop order changes outlined
[here](https://doc.rust-lang.org/edition-guide/rust-2024/temporary-tail-expr-scope.html)
and
[here](https://doc.rust-lang.org/edition-guide/rust-2024/temporary-if-let-scope.html),
this change is not as risk-free as I would like (potentially causing
future cancellation issues, or maybe resolving latent ones). But
hopefully a full release cycle would be enough time to bake these
changes.

Author: sunshowers

Cargo.toml

@@ -321,6 +321,9 @@ default-members = [
 ]
 resolver = "3"
 
+[workspace.package]
+edition = "2024"
+
 #
 # Tree-wide lint configuration.
 # https://doc.rust-lang.org/stable/cargo/reference/manifest.html#the-lints-section

api_identity/Cargo.toml

@@ -3,7 +3,7 @@ name = "api_identity"
 description = "macro used for Oxide control plane resources with an identity"
 version = "0.1.0"
 authors = ["David Pacheco <[email protected]>"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/oxidecomputer/omicron/"
 license = "MPL-2.0"
 

bootstore/Cargo.toml

@@ -2,7 +2,7 @@
 name = "bootstore"
 description = "Storage required for rack unlock"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 license = "MPL-2.0"
 
 [build-dependencies]

certificates/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "omicron-certificates"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 license = "MPL-2.0"
 
 [lints]

certificates/src/openssl_ext.rs

@@ -16,7 +16,7 @@ use std::ffi::c_int;
 use std::ffi::c_uint;
 use std::ptr;
 
-extern "C" {
+unsafe extern "C" {
     // `X509_check_host()` is only exported by `openssl-sys` if the `bindgen`
     // feature is enabled
     // (https://github.com/sfackler/rust-openssl/issues/2041). For now, we'll

clickhouse-admin/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "omicron-clickhouse-admin"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 license = "MPL-2.0"
 
 [dependencies]

clickhouse-admin/api/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "clickhouse-admin-api"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 license = "MPL-2.0"
 
 [lints]

clickhouse-admin/src/context.rs

@@ -50,8 +50,8 @@ impl KeeperServerContext {
 
         // If there is already a configuration file with a generation number we'll
         // use that. Otherwise, we set the generation number to None.
-        let gen = read_generation_from_file(config_path)?;
-        let (generation_tx, generation_rx) = watch::channel(gen);
+        let generation = read_generation_from_file(config_path)?;
+        let (generation_tx, generation_rx) = watch::channel(generation);
 
         // We only want to handle one in flight request at a time. Reconfigurator execution will retry
         // again later anyway. We use flume bounded channels with a size of 0 to act as a rendezvous channel.
@@ -137,8 +137,8 @@ impl ServerContext {
 
         // If there is already a configuration file with a generation number we'll
         // use that. Otherwise, we set the generation number to None.
-        let gen = read_generation_from_file(config_path)?;
-        let (generation_tx, generation_rx) = watch::channel(gen);
+        let generation = read_generation_from_file(config_path)?;
+        let (generation_tx, generation_rx) = watch::channel(generation);
 
         // We only want to handle one in flight request at a time. Reconfigurator execution will retry
         // again later anyway. We use flume bounded channels with a size of 0 to act as a rendezvous channel.
@@ -499,9 +499,9 @@ fn read_generation_from_file(path: Utf8PathBuf) -> Result<Option<Generation>> {
         )
     })?;
 
-    let gen = Generation::try_from(gen_u64)?;
+    let generation = Generation::try_from(gen_u64)?;
 
-    Ok(Some(gen))
+    Ok(Some(generation))
 }
 
 #[cfg(test)]

clickhouse-admin/src/http_entrypoints.rs

@@ -54,7 +54,7 @@ impl ClickhouseAdminServerApi for ClickhouseAdminServerImpl {
         rqctx: RequestContext<Self::Context>,
     ) -> Result<HttpResponseOk<Generation>, HttpError> {
         let ctx = rqctx.context();
-        let gen = match ctx.generation() {
+        let generation = match ctx.generation() {
             Some(g) => g,
             None => {
                 return Err(HttpError::for_client_error(
@@ -64,7 +64,7 @@ impl ClickhouseAdminServerApi for ClickhouseAdminServerImpl {
                 ));
             }
         };
-        Ok(HttpResponseOk(gen))
+        Ok(HttpResponseOk(generation))
     }
 
     async fn distributed_ddl_queue(
@@ -120,7 +120,7 @@ impl ClickhouseAdminKeeperApi for ClickhouseAdminKeeperImpl {
         rqctx: RequestContext<Self::Context>,
     ) -> Result<HttpResponseOk<Generation>, HttpError> {
         let ctx = rqctx.context();
-        let gen = match ctx.generation() {
+        let generation = match ctx.generation() {
             Some(g) => g,
             None => {
                 return Err(HttpError::for_client_error(
@@ -130,7 +130,7 @@ impl ClickhouseAdminKeeperApi for ClickhouseAdminKeeperImpl {
                 ));
             }
         };
-        Ok(HttpResponseOk(gen))
+        Ok(HttpResponseOk(generation))
     }
 
     async fn lgif(

clickhouse-admin/test-utils/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "clickhouse-admin-test-utils"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
 license = "MPL-2.0"
 
 [lints]