diff --git a/Cargo.lock b/Cargo.lock index e351d3c9e..b73fc0ec5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -709,12 +709,6 @@ dependencies = [ "tiny-keccak", ] -[[package]] -name = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - [[package]] name = "core-foundation" version = "0.9.4" @@ -897,15 +891,23 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.20" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" +checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3" dependencies = [ - "convert_case", "proc-macro2", "quote", - "rustc_version", "syn 2.0.101", + "unicode-xid", ] [[package]] @@ -2426,7 +2428,7 @@ dependencies = [ "once_cell", "socket2 0.6.0", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] @@ -3502,6 +3504,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "untrusted" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 4d6e3a870..3701a2d4c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,7 +91,7 @@ chrono = { version = "0.4.32", default-features = false, features = [ "now", "std", ] } -derive_more = "0.99.17" +derive_more = { version = "2", features = ["display", "from"] } derive-where = "1.2.7" flate2 = { version = "1.0", optional = true } futures-io = "0.3.21" diff --git a/src/event/sdam/topology_description.rs b/src/event/sdam/topology_description.rs index 949042bff..acd2bf95b 100644 --- a/src/event/sdam/topology_description.rs +++ b/src/event/sdam/topology_description.rs @@ -12,7 +12,7 @@ use crate::{ /// A description of the most up-to-date information known about a topology. Further details can /// be found in the [Server Discovery and Monitoring specification](https://specifications.readthedocs.io/en/latest/server-discovery-and-monitoring/server-discovery-and-monitoring/). #[derive(Clone, derive_more::Display)] -#[display(fmt = "{description}")] +#[display("{description}")] pub struct TopologyDescription { pub(crate) description: crate::sdam::TopologyDescription, } diff --git a/src/selection_criteria.rs b/src/selection_criteria.rs index 8ecdd2ac4..a2d80166a 100644 --- a/src/selection_criteria.rs +++ b/src/selection_criteria.rs @@ -21,12 +21,12 @@ pub enum SelectionCriteria { /// staleness, and server tags. /// /// See the documentation [here](https://www.mongodb.com/docs/manual/core/read-preference/) for more details. - #[display(fmt = "ReadPreference {_0}")] + #[display("ReadPreference {_0}")] ReadPreference(ReadPreference), /// A predicate used to filter servers that are considered suitable. A `server` will be /// considered suitable by a `predicate` if `predicate(server)` returns true. - #[display(fmt = "Custom predicate")] + #[display("Custom predicate")] Predicate(#[derive_where(skip)] Predicate), }