diff --git a/Cargo.lock b/Cargo.lock index f30be91..5dd5506 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -383,9 +383,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.125" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "indexmap", "itoa", diff --git a/schemars/Cargo.toml b/schemars/Cargo.toml index 443cd2e..111cc77 100644 --- a/schemars/Cargo.toml +++ b/schemars/Cargo.toml @@ -15,7 +15,7 @@ rust-version = "1.65" [dependencies] schemars_derive = { version = "=1.0.0-alpha.11", optional = true, path = "../schemars_derive" } serde = { version = "1.0", default-features = false, features = ["alloc"]} -serde_json = { version = "1.0.122", default-features = false, features = ["alloc"] } +serde_json = { version = "1.0.127", default-features = false, features = ["alloc"] } dyn-clone = "1.0" ref-cast = "1.0.22" diff --git a/schemars/src/_private/mod.rs b/schemars/src/_private/mod.rs index f2ebc05..ccae4e3 100644 --- a/schemars/src/_private/mod.rs +++ b/schemars/src/_private/mod.rs @@ -235,9 +235,7 @@ pub fn flatten(schema: &mut Schema, other: Schema) { } } "oneOf" | "anyOf" => { - // `OccupiedEntry` currently has no `.remove_entry()` method :( - let key = occupied.key().clone(); - let current = occupied.remove(); + let (key, current) = occupied.remove_entry(); flatten_property( obj1, "allOf".to_owned(),