diff --git a/Cargo.toml b/Cargo.toml index be6e3f80e..c4345b4e6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,7 +77,7 @@ chrono = { version = "0.4.7", default-features = false, features = [ "clock", "std", ] } -derive_more = "0.99.17" +derive_more = { version = "1.0", features = ["from", "display"] } derive-where = "1.2.7" flate2 = { version = "1.0", optional = true } futures-io = "0.3.21" @@ -98,7 +98,10 @@ openssl = { version = "0.10.38", optional = true } openssl-probe = { version = "0.1.5", optional = true } pem = { version = "3.0.4", optional = true } percent-encoding = "2.0.0" -pkcs8 = { version = "0.10.2", features = ["encryption", "pkcs5"], optional = true } +pkcs8 = { version = "0.10.2", features = [ + "encryption", + "pkcs5", +], optional = true } rand = { version = "0.8.3", features = ["small_rng"] } rayon = { version = "1.5.3", optional = true } rustc_version_runtime = "0.3.0" @@ -111,10 +114,10 @@ socket2 = "0.5.5" stringprep = "0.1.2" strsim = "0.11.1" take_mut = "0.2.2" -thiserror = "1.0.24" +thiserror = "2.0" tokio-openssl = { version = "0.6.3", optional = true } tracing = { version = "0.1.36", optional = true } -typed-builder = "0.10.0" +typed-builder = "0.20" webpki-roots = "0.25.2" zstd = { version = "0.11.2", optional = true } macro_magic = "0.5.1" diff --git a/src/client/auth/oidc.rs b/src/client/auth/oidc.rs index 075f1290c..1ffa0070b 100644 --- a/src/client/auth/oidc.rs +++ b/src/client/auth/oidc.rs @@ -965,6 +965,7 @@ pub(super) fn validate_credential(credential: &Credential) -> Result<()> { } } } + if credential .source .as_ref() diff --git a/src/event/sdam/topology_description.rs b/src/event/sdam/topology_description.rs index cc21cf068..a9e6e5bb7 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 4fce8125c..2460dc00e 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), }