rebase fixes

Author: isabelatkinson

src/action/bulk_write.rs

@@ -118,7 +118,7 @@ impl<'a> BulkWrite<'a> {
 }
 
 action_impl! {
-    impl Action<'a> for BulkWrite<'a> {
+    impl<'a> Action for BulkWrite<'a> {
         type Future = BulkWriteFuture;
 
         async fn execute(mut self) -> Result<BulkWriteResult> {

src/error.rs

@@ -7,18 +7,12 @@ use std::{
     sync::Arc,
 };
 
-use crate::{
-    bson::Document,
-    options::ServerAddress,
-    sdam::{ServerType, TopologyVersion},
-};
-use bson::Bson;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use crate::{
     action::bulk_write::error::BulkWriteError as ClientBulkWriteError,
-    bson::Document,
+    bson::{Bson, Document},
     options::ServerAddress,
     sdam::{ServerType, TopologyVersion},
 };

src/operation.rs

@@ -52,7 +52,6 @@ use crate::{
 };
 
 pub(crate) use abort_transaction::AbortTransaction;
-pub(crate) use bulk_write::{BulkWrite, BulkWriteOperationResponse, BulkWriteSummaryInfo};
 pub(crate) use commit_transaction::CommitTransaction;
 pub(crate) use create_indexes::CreateIndexes;
 pub(crate) use delete::Delete;

src/selection_criteria.rs

@@ -53,14 +53,6 @@ impl SelectionCriteria {
         }
     }
 
-    #[cfg(test)]
-    pub(crate) fn as_predicate(&self) -> Option<&Predicate> {
-        match self {
-            Self::Predicate(ref p) => Some(p),
-            _ => None,
-        }
-    }
-
     pub(crate) fn from_address(address: ServerAddress) -> Self {
         SelectionCriteria::Predicate(Arc::new(move |server| server.address() == &address))
     }