Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/client/auth/oidc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@ pub(super) fn validate_credential(credential: &Credential) -> Result<()> {
}
}
}

if credential
.source
.as_ref()
Expand Down
2 changes: 1 addition & 1 deletion src/event/sdam/topology_description.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
4 changes: 2 additions & 2 deletions src/selection_criteria.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}

Expand Down