RUST-1406 Update driver to use merged bson serde errors (#1411)

Author: abr-egn

Cargo.lock

@@ -110,6 +110,7 @@ macro_rules! use_either {
     ($($name:ident => $path3:path | $path2:path);+;) => {
         $(
             #[cfg(feature = "bson-3")]
+            #[allow(unused_imports)]
             pub(crate) use crate::bson::{$path3 as $name};
 
             #[cfg(not(feature = "bson-3"))]
@@ -123,6 +124,8 @@ macro_rules! use_either {
 use_either! {
     RawResult                       => error::Result                    | raw::Result;
     RawError                        => error::Error                     | raw::Error;
+    DeError                         => error::Error                     | de::Error;
+    SerError                        => error::Error                     | ser::Error;
     serialize_to_raw_document_buf   => serialize_to_raw_document_buf    | to_raw_document_buf;
     serialize_to_document           => serialize_to_document            | to_document;
     serialize_to_bson               => serialize_to_bson                | to_bson;

src/bson_compat.rs

@@ -543,6 +543,8 @@ impl Error {
             | ErrorKind::GridFs(_) => {}
             #[cfg(feature = "in-use-encryption")]
             ErrorKind::Encryption(_) => {}
+            #[cfg(feature = "bson-3")]
+            ErrorKind::Bson(_) => {}
         }
     }
 }
@@ -556,18 +558,21 @@ where
     }
 }
 
+#[cfg(not(feature = "bson-3"))]
 impl From<crate::bson::de::Error> for ErrorKind {
     fn from(err: crate::bson::de::Error) -> Self {
         Self::BsonDeserialization(err)
     }
 }
 
+#[cfg(not(feature = "bson-3"))]
 impl From<crate::bson::ser::Error> for ErrorKind {
     fn from(err: crate::bson::ser::Error) -> Self {
         Self::BsonSerialization(err)
     }
 }
 
+#[cfg(not(feature = "bson-3"))]
 impl From<crate::bson_compat::RawError> for ErrorKind {
     fn from(err: crate::bson_compat::RawError) -> Self {
         Self::InvalidResponse {
@@ -576,6 +581,13 @@ impl From<crate::bson_compat::RawError> for ErrorKind {
     }
 }
 
+#[cfg(feature = "bson-3")]
+impl From<crate::bson::error::Error> for ErrorKind {
+    fn from(err: crate::bson::error::Error) -> Self {
+        Self::Bson(err)
+    }
+}
+
 impl From<std::io::Error> for ErrorKind {
     fn from(err: std::io::Error) -> Self {
         Self::Io(Arc::new(err))
@@ -617,13 +629,18 @@ pub enum ErrorKind {
     #[non_exhaustive]
     Authentication { message: String },
 
-    /// Wrapper around `bson::de::Error`.
+    /// Wrapper around `bson::de::Error`.  Unused if the `bson-3` feature is enabled.
+    #[error("{0}")]
+    BsonDeserialization(crate::bson_compat::DeError),
+
+    /// Wrapper around `bson::ser::Error`.  Unused if the `bson-3` feature is enabled.
     #[error("{0}")]
-    BsonDeserialization(crate::bson::de::Error),
+    BsonSerialization(crate::bson_compat::SerError),
 
-    /// Wrapper around `bson::ser::Error`.
+    /// Wrapper around `bson::error::Error`.
+    #[cfg(feature = "bson-3")]
     #[error("{0}")]
-    BsonSerialization(crate::bson::ser::Error),
+    Bson(crate::bson::error::Error),
 
     /// An error occurred when trying to execute an [`insert_many`](crate::Collection::insert_many)
     /// operation.

src/error.rs

@@ -317,7 +317,7 @@ pub(crate) enum Expectation {
 
 fn deserialize_op<'de, 'a, T: 'a + DeserializeOwned + TestOperation>(
     value: Document,
-) -> std::result::Result<Box<dyn TestOperation + 'a>, crate::bson::de::Error> {
+) -> std::result::Result<Box<dyn TestOperation + 'a>, crate::bson_compat::DeError> {
     crate::bson_compat::deserialize_from_document::<T>(value)
         .map(|op| Box::new(op) as Box<dyn TestOperation>)
 }

src/test/spec/unified_runner/operation.rs

@@ -311,7 +311,7 @@ impl<'de> Deserialize<'de> for Operation {
 
 fn deserialize_op<'de, 'a, Op: TestOperation + Deserialize<'de> + 'a>(
     arguments: Document,
-) -> std::result::Result<Box<dyn TestOperation + 'a>, crate::bson::de::Error> {
+) -> std::result::Result<Box<dyn TestOperation + 'a>, crate::bson_compat::DeError> {
     Ok(Box::new(Op::deserialize(BsonDeserializer::new(
         Bson::Document(arguments),
     ))?))