RUST-1887 Update driver for bson append changes (#1390)

Author: abr-egn

Cargo.lock

@@ -0,0 +1,17 @@
+pub(crate) trait RawDocumentBufExt {
+    fn append_ref<'a>(
+        &mut self,
+        key: impl AsRef<str>,
+        value: impl Into<crate::bson::raw::RawBsonRef<'a>>,
+    );
+}
+
+impl RawDocumentBufExt for crate::bson::RawDocumentBuf {
+    fn append_ref<'a>(
+        &mut self,
+        key: impl AsRef<str>,
+        value: impl Into<crate::bson::raw::RawBsonRef<'a>>,
+    ) {
+        self.append(key, value)
+    }
+}

src/bson_compat.rs

@@ -22,6 +22,9 @@ use crate::{
     runtime::SyncLittleEndianRead,
 };
 
+#[cfg(feature = "bson-3")]
+use crate::bson_compat::RawDocumentBufExt as _;
+
 /// Coerce numeric types into an `i64` if it would be lossless to do so. If this Bson is not numeric
 /// or the conversion would be lossy (e.g. 1.5 -> 1), this returns `None`.
 #[allow(clippy::cast_possible_truncation)]

src/bson_util.rs

@@ -121,6 +121,17 @@ impl From<&OsMetadata> for RawBson {
     }
 }
 
+#[cfg(feature = "bson-3")]
+impl crate::bson::raw::BindRawBsonRef for &OsMetadata {
+    fn bind<F, R>(self, f: F) -> R
+    where
+        F: for<'a> FnOnce(bson3::RawBsonRef<'a>) -> R,
+    {
+        let raw: RawBson = self.into();
+        raw.bind(f)
+    }
+}
+
 impl From<&RuntimeEnvironment> for RawBson {
     fn from(env: &RuntimeEnvironment) -> Self {
         let RuntimeEnvironment {
@@ -158,6 +169,17 @@ impl From<&RuntimeEnvironment> for RawBson {
     }
 }
 
+#[cfg(feature = "bson-3")]
+impl crate::bson::raw::BindRawBsonRef for &RuntimeEnvironment {
+    fn bind<F, R>(self, f: F) -> R
+    where
+        F: for<'a> FnOnce(bson3::RawBsonRef<'a>) -> R,
+    {
+        let raw: RawBson = self.into();
+        raw.bind(f)
+    }
+}
+
 impl RuntimeEnvironment {
     pub(crate) const UNSET: Self = RuntimeEnvironment {
         name: None,

src/cmap/establish/handshake.rs

@@ -21,6 +21,8 @@ pub mod options;
 pub use ::mongocrypt;
 
 pub mod action;
+#[cfg(feature = "bson-3")]
+pub(crate) mod bson_compat;
 mod bson_util;
 pub mod change_stream;
 pub(crate) mod checked;

src/lib.rs

@@ -13,6 +13,9 @@ use crate::{
 
 use super::ExecutionContext;
 
+#[cfg(feature = "bson-3")]
+use crate::bson_compat::RawDocumentBufExt as _;
+
 #[derive(Clone, Debug)]
 pub(crate) enum UpdateOrReplace {
     UpdateModifications(UpdateModifications),

src/operation/update.rs

@@ -111,6 +111,17 @@ impl From<TopologyVersion> for RawBson {
     }
 }
 
+#[cfg(feature = "bson-3")]
+impl crate::bson::raw::BindRawBsonRef for TopologyVersion {
+    fn bind<F, R>(self, f: F) -> R
+    where
+        F: for<'a> FnOnce(bson3::RawBsonRef<'a>) -> R,
+    {
+        let raw: RawBson = self.into();
+        raw.bind(f)
+    }
+}
+
 /// A description of the most up-to-date information known about a server.
 #[derive(Debug, Clone, Serialize)]
 pub(crate) struct ServerDescription {