chore: Use Rust 2024 edition

Author: Techassi

Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
 members = ["crates/*"]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 authors = ["Stackable GmbH <[email protected]>"]
 license = "Apache-2.0"
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/stackabletech/operator-rs"
 
 [workspace.dependencies]

crates/stackable-operator/src/cli.rs

@@ -381,7 +381,7 @@ mod tests {
     #[test]
     fn product_operator_run_watch_namespace() {
         // clean env var to not interfere if already set
-        env::remove_var(WATCH_NAMESPACE);
+        unsafe { env::remove_var(WATCH_NAMESPACE) };
 
         // cli with namespace
         let opts = ProductOperatorRun::parse_from([
@@ -414,7 +414,7 @@ mod tests {
         );
 
         // env with namespace
-        env::set_var(WATCH_NAMESPACE, "foo");
+        unsafe { env::set_var(WATCH_NAMESPACE, "foo") };
         let opts = ProductOperatorRun::parse_from(["run", "--product-config", "bar"]);
         assert_eq!(
             opts,

crates/stackable-operator/src/commons/networking.rs

@@ -79,8 +79,8 @@ impl JsonSchema for HostName {
         "HostName".to_owned()
     }
 
-    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-        String::json_schema(gen)
+    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        String::json_schema(generator)
     }
 }
 

crates/stackable-operator/src/product_config_utils.rs

@@ -521,11 +521,11 @@ where
 mod tests {
     macro_rules! collection {
         // map-like
-        ($($k:expr => $v:expr),* $(,)?) => {
+        ($($k:expr_2021 => $v:expr_2021),* $(,)?) => {
             [$(($k, $v),)*].into()
         };
         // set-like
-        ($($v:expr),* $(,)?) => {
+        ($($v:expr_2021),* $(,)?) => {
             [$($v,)*].into()
         };
     }

crates/stackable-operator/src/time/duration.rs

@@ -170,8 +170,8 @@ impl JsonSchema for Duration {
         "Duration".to_string()
     }
 
-    fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-        String::json_schema(gen)
+    fn json_schema(generator: &mut schemars::r#gen::SchemaGenerator) -> schemars::schema::Schema {
+        String::json_schema(generator)
     }
 }
 

crates/stackable-operator/src/utils/crds.rs

@@ -1,14 +1,14 @@
 use schemars::schema::Schema;
 
-pub fn raw_object_schema(_: &mut schemars::gen::SchemaGenerator) -> Schema {
+pub fn raw_object_schema(_: &mut schemars::r#gen::SchemaGenerator) -> Schema {
     serde_json::from_value(serde_json::json!({
         "type": "object",
         "x-kubernetes-preserve-unknown-fields": true,
     }))
     .expect("Failed to parse JSON of custom raw object schema")
 }
 
-pub fn raw_optional_object_schema(_: &mut schemars::gen::SchemaGenerator) -> Schema {
+pub fn raw_optional_object_schema(_: &mut schemars::r#gen::SchemaGenerator) -> Schema {
     serde_json::from_value(serde_json::json!({
         "type": "object",
         "nullable": true,
@@ -17,7 +17,7 @@ pub fn raw_optional_object_schema(_: &mut schemars::gen::SchemaGenerator) -> Sch
     .expect("Failed to parse JSON of custom optional raw object schema")
 }
 
-pub fn raw_object_list_schema(_: &mut schemars::gen::SchemaGenerator) -> Schema {
+pub fn raw_object_list_schema(_: &mut schemars::r#gen::SchemaGenerator) -> Schema {
     serde_json::from_value(serde_json::json!({
         "type": "array",
         "items": {

crates/stackable-versioned-macros/src/attrs/item/mod.rs

@@ -163,8 +163,8 @@ impl CommonItemAttributes {
         // Now, iterate over all changes and ensure that their versions are
         // between the added and deprecated version.
         if !self.changes.iter().all(|r| {
-            added_version.map_or(true, |a| a < *r.since)
-                && deprecated_version.map_or(true, |d| d > *r.since)
+            added_version.is_none_or(|a| a < *r.since)
+                && deprecated_version.is_none_or(|d| d > *r.since)
         }) {
             return Err(Error::custom(
                 "all changes must use versions higher than `added` and lower than `deprecated`",

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.84.1"
+channel = "1.85.0"