Skip to content

Commit

Permalink
cargo +nightly clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
sbernauer committed Mar 18, 2022
1 parent 98fc31a commit 99348f9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions kube-core/src/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ use std::collections::btree_map::Entry;
// Used in docs
#[allow(unused_imports)] use schemars::gen::SchemaSettings;

use schemars::schema::Metadata;
use schemars::{
schema::{ObjectValidation, Schema, SchemaObject},
schema::{Metadata, ObjectValidation, Schema, SchemaObject},
visit::Visitor,
};

Expand Down Expand Up @@ -47,8 +46,12 @@ impl Visitor for StructuralSchemaRewriter {
if let Some(variant_metadata) = variant_metadata {
// Move enum variant description from oneOf clause to its corresponding property
if let Some(description) = std::mem::take(&mut variant_metadata.description) {
if let Some(Schema::Object(variant_object)) = only_item(variant_obj.properties.values_mut()) {
let metadata = variant_object.metadata.get_or_insert_with(|| Box::new(Metadata::default()));
if let Some(Schema::Object(variant_object)) =
only_item(variant_obj.properties.values_mut())
{
let metadata = variant_object
.metadata
.get_or_insert_with(|| Box::new(Metadata::default()));
metadata.description = Some(description);
}
}
Expand Down
2 changes: 1 addition & 1 deletion kube-derive/tests/crd_schema_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ enum ComplexEnum {
/// Second variant with an String
VariantTwo { str: String },
/// Third variant which doesn't has an attribute
VariantThree {}
VariantThree {},
}

#[test]
Expand Down

0 comments on commit 99348f9

Please sign in to comment.