RUST-2217 Optionally support bson crate 3.0

Cargo.toml

@@ -30,7 +30,10 @@ exclude = [
 
 [features]
 default = ["compat-3-0-0", "rustls-tls", "dns-resolver"]
-compat-3-0-0 = []
+compat-3-0-0 = ["compat-3-3-0", "bson-2"]
+compat-3-3-0 = []
+bson-2 = ["dep:bson2", "mongocrypt/bson-2"]
+bson-3 = ["dep:bson3", "mongocrypt/bson-3"]
 sync = []
 rustls-tls = ["dep:rustls", "dep:tokio-rustls"]
 openssl-tls = ["dep:openssl", "dep:openssl-probe", "dep:tokio-openssl"]
@@ -73,7 +76,6 @@ tracing-unstable = ["dep:tracing", "dep:log"]
 async-trait = "0.1.42"
 base64 = "0.13.0"
 bitflags = "1.1.0"
-bson = { git = "https://github.com/mongodb/bson-rust", branch = "main", version = "2.14.0" }
 chrono = { version = "0.4.7", default-features = false, features = [
     "clock",
     "std",
@@ -92,7 +94,6 @@ hmac = "0.12.1"
 once_cell = "1.19.0"
 log = { version = "0.4.17", optional = true }
 md-5 = "0.10.1"
-mongocrypt = { git = "https://github.com/mongodb/libmongocrypt-rust.git", branch = "main", optional = true, version = "0.2.1" }
 mongodb-internal-macros = { path = "macros", version = "3.2.3" }
 num_cpus = { version = "1.13.1", optional = true }
 openssl = { version = "0.10.38", optional = true }
@@ -120,6 +121,27 @@ zstd = { version = "0.11.2", optional = true }
 macro_magic = "0.5.1"
 rustversion = "1.0.20"
 
+[dependencies.bson2]
+git = "https://github.com/mongodb/bson-rust"
+branch = "2.15.x"
+package = "bson"
+version = "2.15.0"
+optional = true
+
+[dependencies.bson3]
+git = "https://github.com/mongodb/bson-rust"
+branch = "main"
+package = "bson"
+version = "3.0.0"
+optional = true
+
+[dependencies.mongocrypt]
+git = "https://github.com/mongodb/libmongocrypt-rust.git"
+branch = "main"
+version = "0.3.0"
+default-features = false
+optional = true
+
 [dependencies.pbkdf2]
 version = "0.11.0"
 default-features = false

src/action.rs

@@ -88,8 +88,7 @@ pub trait Action: private::Sealed + IntoFuture {
     /// If the value is `Some`, call the provided function on `self`.  Convenient for chained
     /// updates with values that need to be set conditionally.  For example:
     /// ```rust
-    /// # use mongodb::{Client, error::Result};
-    /// # use bson::Document;
+    /// # use mongodb::{Client, error::Result, bson::Document};
     /// use mongodb::action::Action;
     /// async fn list_my_collections(client: &Client, filter: Option<Document>) -> Result<Vec<String>> {
     ///     client.database("my_db")

src/action/aggregate.rs

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, time::Duration};
 
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 
 use crate::{
     coll::options::{AggregateOptions, Hint},

src/action/count.rs

@@ -1,4 +1,4 @@
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 use std::time::Duration;
 
 use crate::{

src/action/create_collection.rs

@@ -1,4 +1,4 @@
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 use std::time::Duration;
 
 use crate::{

src/action/create_index.rs

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, time::Duration};
 
-use bson::Bson;
+use crate::bson::Bson;
 
 use crate::{
     coll::options::{CommitQuorum, CreateIndexOptions},

src/action/csfle/create_encrypted_collection.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::{doc, Bson, Document};
+use crate::bson::{doc, Bson, Document};
 
 use crate::{
     action::{action_impl, export_doc, option_setters, options_doc},

src/action/csfle/encrypt.rs

@@ -1,4 +1,4 @@
-use bson::{Binary, Bson, RawDocumentBuf};
+use crate::bson::{Binary, Bson, RawDocumentBuf};
 use macro_magic::export_tokens;
 use mongocrypt::ctx::Algorithm;
 use serde::Serialize;
@@ -22,7 +22,7 @@ impl ClientEncryption {
     #[options_doc(encrypt)]
     pub fn encrypt(
         &self,
-        value: impl Into<bson::RawBson>,
+        value: impl Into<crate::bson::RawBson>,
         key: impl Into<EncryptKey>,
         algorithm: Algorithm,
     ) -> Encrypt {
@@ -101,7 +101,7 @@ pub struct Encrypt<'a, Mode = Value> {
 }
 
 pub struct Value {
-    pub(crate) value: bson::RawBson,
+    pub(crate) value: crate::bson::RawBson,
 }
 
 pub struct Expression {

src/action/delete.rs

@@ -1,4 +1,4 @@
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 
 use crate::{
     coll::options::{DeleteOptions, Hint},

src/action/distinct.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 
 use crate::{
     coll::options::{DistinctOptions, Hint},

src/action/drop.rs

@@ -1,5 +1,5 @@
 #[cfg(feature = "in-use-encryption")]
-use bson::Document;
+use crate::bson::Document;
 
 use crate::{
     coll::options::DropCollectionOptions,

src/action/drop_index.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::Bson;
+use crate::bson::Bson;
 
 use crate::{
     coll::options::DropIndexOptions,

src/action/find.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 use serde::de::DeserializeOwned;
 
 use crate::{

src/action/find_and_modify.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Borrow, time::Duration};
 
-use bson::{Bson, Document, RawDocumentBuf};
+use crate::bson::{Bson, Document, RawDocumentBuf};
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
@@ -107,7 +107,7 @@ impl<T: Serialize + DeserializeOwned + Send + Sync> Collection<T> {
         FindOneAndReplace {
             coll: self,
             filter,
-            replacement: bson::to_raw_document_buf(replacement.borrow()).map_err(Into::into),
+            replacement: crate::bson::to_raw_document_buf(replacement.borrow()).map_err(Into::into),
             options: None,
             session: None,
         }

src/action/gridfs/delete.rs

@@ -1,4 +1,4 @@
-use bson::{doc, Bson};
+use crate::bson::{doc, Bson};
 
 #[cfg(docsrs)]
 use crate::gridfs::FilesCollectionDocument;
@@ -108,7 +108,7 @@ impl<'a> Action for DeleteByName<'a> {
             .find(doc! { "filename": self.filename.clone() })
             .projection(doc! { "_id": 1 })
             .await?
-            .with_type::<bson::Document>()
+            .with_type::<crate::bson::Document>()
             .map(|r| match r {
                 Ok(mut d) => d
                     .remove("_id")

src/action/gridfs/download.rs

@@ -1,4 +1,4 @@
-use bson::{doc, Bson};
+use crate::bson::{doc, Bson};
 
 use crate::{
     action::{action_impl, deeplink, export_doc, option_setters, options_doc},

src/action/gridfs/find.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::Document;
+use crate::bson::Document;
 
 use crate::{
     action::{action_impl, deeplink, export_doc, option_setters, options_doc},

src/action/gridfs/rename.rs

@@ -1,4 +1,4 @@
-use bson::{doc, Bson};
+use crate::bson::{doc, Bson};
 
 use crate::{
     action::action_impl,

src/action/gridfs/upload.rs

@@ -1,4 +1,4 @@
-use bson::{oid::ObjectId, Bson, Document};
+use crate::bson::{oid::ObjectId, Bson, Document};
 
 #[cfg(docsrs)]
 use crate::gridfs::FilesCollectionDocument;

src/action/insert_many.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Borrow, collections::HashSet, ops::Deref};
 
-use bson::{Bson, RawDocumentBuf};
+use crate::bson::{Bson, RawDocumentBuf};
 use serde::Serialize;
 
 use crate::{
@@ -34,7 +34,7 @@ impl<T: Serialize + Send + Sync> Collection<T> {
             coll: CollRef::new(self),
             docs: docs
                 .into_iter()
-                .map(|v| bson::to_raw_document_buf(v.borrow()).map_err(Into::into))
+                .map(|v| crate::bson::to_raw_document_buf(v.borrow()).map_err(Into::into))
                 .collect(),
             options: None,
             session: None,

src/action/insert_one.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Borrow, ops::Deref};
 
-use bson::{Bson, RawDocumentBuf};
+use crate::bson::{Bson, RawDocumentBuf};
 use serde::Serialize;
 
 use crate::{
@@ -32,7 +32,7 @@ impl<T: Serialize + Send + Sync> Collection<T> {
     pub fn insert_one(&self, doc: impl Borrow<T>) -> InsertOne {
         InsertOne {
             coll: CollRef::new(self),
-            doc: bson::to_raw_document_buf(doc.borrow()).map_err(Into::into),
+            doc: crate::bson::to_raw_document_buf(doc.borrow()).map_err(Into::into),
             options: None,
             session: None,
         }

src/action/list_collections.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 use futures_util::TryStreamExt;
 
 use crate::{

src/action/list_databases.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 
 #[cfg(feature = "sync")]
 use crate::sync::Client as SyncClient;
@@ -106,7 +106,8 @@ impl<'a> Action for ListDatabases<'a, ListSpecifications> {
             .and_then(|dbs| {
                 dbs.into_iter()
                     .map(|db_spec| {
-                        bson::from_slice(db_spec.as_bytes()).map_err(crate::error::Error::from)
+                        crate::bson::from_slice(db_spec.as_bytes())
+                            .map_err(crate::error::Error::from)
                     })
                     .collect()
             })

src/action/list_indexes.rs

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, time::Duration};
 
-use bson::Bson;
+use crate::bson::Bson;
 use futures_util::stream::TryStreamExt;
 
 use crate::{

src/action/replace_one.rs

@@ -1,6 +1,6 @@
 use std::borrow::Borrow;
 
-use bson::{Bson, Document, RawDocumentBuf};
+use crate::bson::{Bson, Document, RawDocumentBuf};
 use serde::Serialize;
 
 use crate::{
@@ -31,7 +31,7 @@ impl<T: Serialize + Send + Sync> Collection<T> {
         ReplaceOne {
             coll: CollRef::new(self),
             query,
-            replacement: bson::to_raw_document_buf(replacement.borrow()).map_err(Into::into),
+            replacement: crate::bson::to_raw_document_buf(replacement.borrow()).map_err(Into::into),
             options: None,
             session: None,
         }

src/action/run_command.rs

@@ -1,6 +1,6 @@
 use std::time::Duration;
 
-use bson::{Bson, Document, RawDocumentBuf};
+use crate::bson::{Bson, Document, RawDocumentBuf};
 
 use crate::{
     client::session::TransactionState,
@@ -154,7 +154,7 @@ impl crate::sync::Database {
 #[must_use]
 pub struct RunCommand<'a> {
     db: &'a Database,
-    command: bson::raw::Result<RawDocumentBuf>,
+    command: crate::bson::raw::Result<RawDocumentBuf>,
     options: Option<RunCommandOptions>,
     session: Option<&'a mut ClientSession>,
 }
@@ -214,7 +214,7 @@ impl<'a> Action for RunCommand<'a> {
 #[must_use]
 pub struct RunCursorCommand<'a, Session = ImplicitSession> {
     db: &'a Database,
-    command: bson::raw::Result<RawDocumentBuf>,
+    command: crate::bson::raw::Result<RawDocumentBuf>,
     options: Option<RunCursorCommandOptions>,
     session: Session,
 }

src/action/search_index.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use bson::{doc, Document};
+use crate::bson::{doc, Document};
 
 use super::{
     action_impl,

src/action/update.rs

@@ -1,4 +1,4 @@
-use bson::{Bson, Document};
+use crate::bson::{Bson, Document};
 
 use crate::{
     coll::options::{Hint, UpdateModifications, UpdateOptions},

src/action/watch.rs

@@ -1,6 +1,6 @@
 use std::{marker::PhantomData, time::Duration};
 
-use bson::{Bson, Document, Timestamp};
+use crate::bson::{Bson, Document, Timestamp};
 use serde::de::DeserializeOwned;
 
 use super::{

src/bson_util.rs

@@ -84,7 +84,7 @@ pub(crate) fn to_raw_bson_array(docs: &[Document]) -> Result<RawBson> {
 pub(crate) fn to_raw_bson_array_ser<T: Serialize>(values: &[T]) -> Result<RawBson> {
     let mut array = RawArrayBuf::new();
     for value in values {
-        array.push(bson::to_raw_document_buf(value)?);
+        array.push(crate::bson::to_raw_document_buf(value)?);
     }
     Ok(RawBson::Array(array))
 }
@@ -213,7 +213,7 @@ pub(crate) fn append_ser(
     struct Helper<T> {
         value: T,
     }
-    let raw_doc = bson::to_raw_document_buf(&Helper { value })?;
+    let raw_doc = crate::bson::to_raw_document_buf(&Helper { value })?;
     this.append_ref(
         key,
         raw_doc

src/change_stream.rs

@@ -12,8 +12,8 @@ use std::{
 };
 
 #[cfg(test)]
-use bson::RawDocumentBuf;
-use bson::{Document, Timestamp};
+use crate::bson::RawDocumentBuf;
+use crate::bson::{Document, Timestamp};
 use derive_where::derive_where;
 use futures_core::{future::BoxFuture, Stream};
 use serde::de::DeserializeOwned;
@@ -158,7 +158,7 @@ where
     /// ```
     pub async fn next_if_any(&mut self) -> Result<Option<T>> {
         Ok(match NextInBatchFuture::new(self).await? {
-            BatchValue::Some { doc, .. } => Some(bson::from_slice(doc.as_bytes())?),
+            BatchValue::Some { doc, .. } => Some(crate::bson::from_slice(doc.as_bytes())?),
             BatchValue::Empty | BatchValue::Exhausted => None,
         })
     }