chore: fix comments, use iter_mut

Author: NickLarsenNZ

kube-core/src/schema/transform_any_of.rs

@@ -91,8 +91,8 @@ fn optional_tagged_enum_with_unit_variants() {
 ///
 /// This will return early without modifications unless:
 /// - There are exactly 2 `anyOf` subschemas.
-/// - One subschema represents the nullability (ie: it has an enum with a single
-///   null entry, and nullable set to true).
+/// - One subschema represents the nullability (ie: it has an `enum` with a single
+///   `null` entry, and `nullable` set to true).
 ///
 /// NOTE: This should work regardless of whether other hoisting has been performed or not.
 pub(crate) fn hoist_any_of_subschema_with_a_nullable_variant(kube_schema: &mut SchemaObject) {

kube-core/src/schema/transform_one_of.rs

@@ -128,7 +128,8 @@ pub(crate) fn hoist_one_of_enum_with_unit_variants(kube_schema: &mut SchemaObjec
         })
         .collect::<Vec<_>>();
 
-    // If there are no enums in the oneOf subschemas, there is nothing more to do here.
+    // If there are no enums (or consts converted to enums) in the oneOf subschemas, there is nothing more to do here.
+    // For example, when the schema has `properties` and `required`, so we leave that for the properties hoister.
     if new_enums.is_empty() {
         return;
     }

kube-core/src/schema/transform_properties.rs

@@ -26,7 +26,7 @@ fn untagged_enum_with_empty_variant_before_one_of_hoisting() {
                 ],
                 "properties": {
                     "two": {
-                        "description": "A very simple enum with empty variants",
+                        "description": "A very simple enum with unit variants",
                         "oneOf": [
                             {
                                 "type": "string",
@@ -81,7 +81,7 @@ fn untagged_enum_with_empty_variant_before_one_of_hoisting() {
                 "type": "string"
             },
             "two": {
-                "description": "A very simple enum with empty variants",
+                "description": "A very simple enum with unit variants",
                 "oneOf": [
                     {
                         "type": "string",
@@ -241,7 +241,7 @@ fn invalid_untagged_enum_with_conflicting_variant_fields_before_one_of_hosting()
                 ],
                 "properties": {
                     "two": {
-                        "description": "A very simple enum with empty variants",
+                        "description": "A very simple enum with unit variants",
                         "oneOf": [
                             {
                                 "type": "string",
@@ -315,7 +315,7 @@ fn invalid_untagged_enum_with_conflicting_variant_fields_after_one_of_hosting()
                 ],
                 "properties": {
                     "two": {
-                        "description": "A very simple enum with empty variants",
+                        "description": "A very simple enum with unit variants",
                         "type": "string",
                         "enum": [
                             "C",
@@ -400,7 +400,7 @@ pub(crate) fn hoist_properties_for_any_of_subschemas(kube_schema: &mut SchemaObj
     // TODO (@NickLarsenNZ): Return errors instead of panicking, leave panicking up to the infallible schemars::Transform
 
     let subschemas = subschemas
-        .into_iter()
+        .iter_mut()
         .map(|schema| match schema {
             Schema::Object(schema_object) => schema_object,
             Schema::Bool(_) => panic!("oneOf and anyOf variants cannot be of type boolean"),