cleanup

Author: isabelatkinson

src/error.rs

@@ -18,7 +18,7 @@ use crate::{
     sdam::{ServerType, TopologyVersion},
 };
 
-pub use bulk_write::BulkWriteError;
+pub use bulk_write::{BulkWriteError, PartialBulkWriteResult};
 
 const RECOVERING_CODES: [i32; 5] = [11600, 11602, 13436, 189, 91];
 const NOTWRITABLEPRIMARY_CODES: [i32; 3] = [10107, 13435, 10058];

src/results/bulk_write.rs

@@ -14,9 +14,9 @@ use crate::{
 #[non_exhaustive]
 pub struct SummaryBulkWriteResult {
     pub inserted_count: i64,
-    pub upserted_count: i64,
     pub matched_count: i64,
     pub modified_count: i64,
+    pub upserted_count: i64,
     pub deleted_count: i64,
 }
 
@@ -27,9 +27,9 @@ pub struct SummaryBulkWriteResult {
 #[non_exhaustive]
 pub struct VerboseBulkWriteResult {
     pub inserted_count: i64,
-    pub upserted_count: i64,
     pub matched_count: i64,
     pub modified_count: i64,
+    pub upserted_count: i64,
     pub deleted_count: i64,
     #[cfg_attr(
         test,
@@ -59,8 +59,6 @@ mod result_trait {
 
         fn merge(&mut self, other: Self);
 
-        fn empty_partial_result() -> PartialBulkWriteResult;
-
         fn into_partial_result(self) -> PartialBulkWriteResult;
 
         fn populate_summary_info(
@@ -90,23 +88,19 @@ impl BulkWriteResult for SummaryBulkWriteResult {
     fn merge(&mut self, other: Self) {
         let SummaryBulkWriteResult {
             inserted_count: other_inserted_count,
-            upserted_count: other_upserted_count,
             matched_count: other_matched_count,
             modified_count: other_modified_count,
+            upserted_count: other_upserted_count,
             deleted_count: other_deleted_count,
         } = other;
 
         self.inserted_count += other_inserted_count;
-        self.upserted_count += other_upserted_count;
         self.matched_count += other_matched_count;
         self.modified_count += other_modified_count;
+        self.upserted_count += other_upserted_count;
         self.deleted_count += other_deleted_count;
     }
 
-    fn empty_partial_result() -> PartialBulkWriteResult {
-        PartialBulkWriteResult::Summary(Default::default())
-    }
-
     fn into_partial_result(self) -> PartialBulkWriteResult {
         PartialBulkWriteResult::Summary(self)
     }
@@ -154,10 +148,6 @@ impl BulkWriteResult for VerboseBulkWriteResult {
         self.delete_results.extend(other_delete_results);
     }
 
-    fn empty_partial_result() -> PartialBulkWriteResult {
-        PartialBulkWriteResult::Verbose(Default::default())
-    }
-
     fn into_partial_result(self) -> PartialBulkWriteResult {
         PartialBulkWriteResult::Verbose(self)
     }