RUST-738 Remove Arc wrapper around BSON errors (#329)

This also updates the driver to track the master branch of the bson repo.

Author: patrickfreed

Cargo.toml

@@ -34,7 +34,7 @@ bson-u2i = ["bson/u2i"]
 async-trait = "0.1.42"
 base64 = "0.13.0"
 bitflags = "1.1.0"
-bson = "1.2.0"
+bson = { git = "https://github.com/mongodb/bson-rust" }
 chrono = "0.4.7"
 derivative = "2.1.1"
 futures = "0.3.5"

src/cursor/mod.rs

@@ -151,11 +151,11 @@ type ImplicitSessionCursor = GenericCursor<ImplicitSessionGetMoreProvider>;
 
 struct ImplicitSessionGetMoreResult {
     get_more_result: Result<GetMoreResult>,
-    session: Option<ClientSession>,
+    session: Option<Box<ClientSession>>,
 }
 
 impl GetMoreProviderResult for ImplicitSessionGetMoreResult {
-    type Session = Option<ClientSession>;
+    type Session = Option<Box<ClientSession>>;
 
     fn as_ref(&self) -> std::result::Result<&GetMoreResult, &Error> {
         self.get_more_result.as_ref()
@@ -170,7 +170,7 @@ impl GetMoreProviderResult for ImplicitSessionGetMoreResult {
 /// This is to be used with cursors associated with implicit sessions.
 enum ImplicitSessionGetMoreProvider {
     Executing(BoxFuture<'static, ImplicitSessionGetMoreResult>),
-    Idle(Option<ClientSession>),
+    Idle(Option<Box<ClientSession>>),
     Done,
 }
 
@@ -179,7 +179,7 @@ impl ImplicitSessionGetMoreProvider {
         if spec.id() == 0 {
             Self::Done
         } else {
-            Self::Idle(session)
+            Self::Idle(session.map(Box::new))
         }
     }
 }
@@ -195,7 +195,7 @@ impl GetMoreProvider for ImplicitSessionGetMoreProvider {
         }
     }
 
-    fn clear_execution(&mut self, session: Option<ClientSession>, exhausted: bool) {
+    fn clear_execution(&mut self, session: Option<Box<ClientSession>>, exhausted: bool) {
         // If cursor is exhausted, immediately return implicit session to the pool.
         if exhausted {
             *self = Self::Done;
@@ -209,8 +209,9 @@ impl GetMoreProvider for ImplicitSessionGetMoreProvider {
             Self::Idle(mut session) => {
                 let future = Box::pin(async move {
                     let get_more = GetMore::new(info);
-                    let get_more_result =
-                        client.execute_operation(get_more, session.as_mut()).await;
+                    let get_more_result = client
+                        .execute_operation(get_more, session.as_mut().map(|b| b.as_mut()))
+                        .await;
                     ImplicitSessionGetMoreResult {
                         get_more_result,
                         session,

src/error.rs

@@ -205,13 +205,13 @@ where
 
 impl From<bson::de::Error> for ErrorKind {
     fn from(err: bson::de::Error) -> Self {
-        Self::BsonDecode(Arc::new(err))
+        Self::BsonDecode(err)
     }
 }
 
 impl From<bson::ser::Error> for ErrorKind {
     fn from(err: bson::ser::Error) -> Self {
-        Self::BsonEncode(Arc::new(err))
+        Self::BsonEncode(err)
     }
 }
 
@@ -257,11 +257,11 @@ pub enum ErrorKind {
 
     /// Wrapper around `bson::de::Error`.
     #[error("{0}")]
-    BsonDecode(Arc<crate::bson::de::Error>),
+    BsonDecode(crate::bson::de::Error),
 
     /// Wrapper around `bson::ser::Error`.
     #[error("{0}")]
-    BsonEncode(Arc<crate::bson::ser::Error>),
+    BsonEncode(crate::bson::ser::Error),
 
     /// An error occurred when trying to execute a write operation consisting of multiple writes.
     #[error("An error occurred when trying to execute a write operation: {0:?}")]

src/sdam/description/server.rs

@@ -257,7 +257,7 @@ impl ServerDescription {
             .as_ref()
             .map_err(Clone::clone)?
             .as_ref()
-            .and_then(|reply| reply.command_response.election_id.clone());
+            .and_then(|reply| reply.command_response.election_id);
         Ok(me)
     }